From 2e55d24f5a3e838e909e41f6ba6528bba1e02a1b Mon Sep 17 00:00:00 2001 From: julihoh Date: Tue, 12 Oct 2021 10:32:21 +0200 Subject: [PATCH] update deps (#327) * experimental update deps * Reverted to rand-core 0.5.1 for Lain compatibility * updated nix * less strict libc dep * remove deprecated errno conversion Co-authored-by: Dominik Maier --- fuzzers/fuzzbench/Cargo.toml | 2 +- fuzzers/fuzzbench_gsoc/Cargo.toml | 2 +- fuzzers/fuzzbench_qemu/Cargo.toml | 2 +- libafl/Cargo.toml | 8 ++++---- libafl/src/bolts/os/pipes.rs | 4 ++-- libafl_frida/Cargo.toml | 4 ++-- libafl_qemu/Cargo.toml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fuzzers/fuzzbench/Cargo.toml b/fuzzers/fuzzbench/Cargo.toml index 078a7d67e2..0c474a4380 100644 --- a/fuzzers/fuzzbench/Cargo.toml +++ b/fuzzers/fuzzbench/Cargo.toml @@ -25,7 +25,7 @@ libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_h # TODO Include it only when building cc libafl_cc = { path = "../../libafl_cc/" } clap = { version = "3.0.0-beta.2", features = ["default"] } -nix = "0.20.0" +nix = "0.23.0" [lib] name = "fuzzbench" diff --git a/fuzzers/fuzzbench_gsoc/Cargo.toml b/fuzzers/fuzzbench_gsoc/Cargo.toml index 078a7d67e2..0c474a4380 100644 --- a/fuzzers/fuzzbench_gsoc/Cargo.toml +++ b/fuzzers/fuzzbench_gsoc/Cargo.toml @@ -25,7 +25,7 @@ libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_h # TODO Include it only when building cc libafl_cc = { path = "../../libafl_cc/" } clap = { version = "3.0.0-beta.2", features = ["default"] } -nix = "0.20.0" +nix = "0.23.0" [lib] name = "fuzzbench" diff --git a/fuzzers/fuzzbench_qemu/Cargo.toml b/fuzzers/fuzzbench_qemu/Cargo.toml index a277ea409e..82418e4b7f 100644 --- a/fuzzers/fuzzbench_qemu/Cargo.toml +++ b/fuzzers/fuzzbench_qemu/Cargo.toml @@ -15,4 +15,4 @@ debug = true libafl = { path = "../../libafl/" } libafl_qemu = { path = "../../libafl_qemu/" } clap = { version = "3.0.0-beta.2", features = ["default"] } -nix = "0.20.0" +nix = "0.23.0" diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml index 282bf0b283..c8f8205776 100644 --- a/libafl/Cargo.toml +++ b/libafl/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" build = "build.rs" [build-dependencies] -rustc_version = "0.3.3" +rustc_version = "0.4" [dev-dependencies] criterion = "0.3" # Benchmarking @@ -56,12 +56,12 @@ required-features = ["std"] [dependencies] tuple_list = { version = "0.1.3" } -hashbrown = { version = "0.9", features = ["serde", "ahash-compile-time-rng"], default-features=false } # A faster hashmap, nostd compatible +hashbrown = { version = "0.11", features = ["serde", "ahash-compile-time-rng"], default-features=false } # A faster hashmap, nostd compatible num = { version = "0.4.0", default-features = false } xxhash-rust = { version = "0.8.2", features = ["xxh3"] } # xxh3 hashing for rust serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib erased-serde = { version = "0.3.12", default-features = false, features = ["alloc"] } # erased serde -postcard = { version = "0.5.1", features = ["alloc"] } # no_std compatible serde serialization fromat +postcard = { version = "0.7", features = ["alloc"] } # no_std compatible serde serialization fromat bincode = {version = "1.3", optional = true } static_assertions = "1.1.0" ctor = "0.1.20" @@ -75,7 +75,7 @@ miniz_oxide = { version = "0.4.4", optional = true} core_affinity = { version = "0.5", git = "https://github.com/s1341/core_affinity_rs", rev = "6648a7a", optional = true } hostname = { version = "^0.3", optional = true } # Is there really no gethostname in the stdlib? rand_core = { version = "0.5.1", optional = true } # This dependency allows us to export our RomuRand as rand::Rng. -nix = { version = "0.20.0", optional = true } +nix = { version = "0.23.0", optional = true } regex = { version = "1", optional = true } build_id = { version = "0.2.1", git = "https://github.com/domenukk/build_id", rev = "6a61943", optional = true } uuid = { version = "0.8.2", optional = true, features = ["serde"] } diff --git a/libafl/src/bolts/os/pipes.rs b/libafl/src/bolts/os/pipes.rs index 43261bedb9..528823a369 100644 --- a/libafl/src/bolts/os/pipes.rs +++ b/libafl/src/bolts/os/pipes.rs @@ -60,7 +60,7 @@ impl Read for Pipe { match self.read_end { Some(read_end) => match read(read_end, buf) { Ok(res) => Ok(res), - Err(e) => Err(io::Error::from_raw_os_error(e.as_errno().unwrap() as i32)), + Err(e) => Err(io::Error::from_raw_os_error(e as i32)), }, None => Err(io::Error::new( ErrorKind::BrokenPipe, @@ -77,7 +77,7 @@ impl Write for Pipe { match self.write_end { Some(write_end) => match write(write_end, buf) { Ok(res) => Ok(res), - Err(e) => Err(io::Error::from_raw_os_error(e.as_errno().unwrap() as i32)), + Err(e) => Err(io::Error::from_raw_os_error(e as i32)), }, None => Err(io::Error::new( ErrorKind::BrokenPipe, diff --git a/libafl_frida/Cargo.toml b/libafl_frida/Cargo.toml index e74c98cd99..57ef13b1fb 100644 --- a/libafl_frida/Cargo.toml +++ b/libafl_frida/Cargo.toml @@ -21,8 +21,8 @@ cc = { version = "1.0", features = ["parallel"] } [dependencies] libafl = { path = "../libafl", version = "0.6.1", features = ["std", "libafl_derive"] } libafl_targets = { path = "../libafl_targets", version = "0.6.1", features = ["sancov_cmplog"] } -nix = "0.20.0" -libc = "0.2.92" +nix = "0.23.0" +libc = "0.2" hashbrown = "0.11" libloading = "0.7.0" rangemap = "0.1.10" diff --git a/libafl_qemu/Cargo.toml b/libafl_qemu/Cargo.toml index c19df853cb..49a438d339 100644 --- a/libafl_qemu/Cargo.toml +++ b/libafl_qemu/Cargo.toml @@ -22,7 +22,7 @@ hashbrown = { version = "0.9", features = ["serde", "ahash-compile-time-rng"] } num = "0.4" num_enum = "0.5.1" goblin = "0.4.2" -libc = "0.2.97" +libc = "0.2" strum = "0.21" strum_macros = "0.21" #pyo3 = { version = "0.14.3", features = ["extension-module"], optional = true }