From ea3e70b6e55b338c146c7dbd76840fb5d4b85b75 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Mon, 15 Jul 2024 14:55:13 +0200 Subject: [PATCH] Remove release_max_level_info from log (#2396) --- libafl/Cargo.toml | 2 +- libafl/src/corpus/ondisk.rs | 11 +++++------ libafl_bolts/Cargo.toml | 2 +- utils/gdb_qemu/gdb_qemu/Cargo.toml | 2 +- utils/noaslr/noaslr/Cargo.toml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml index f18b5762ba..ff97febc47 100644 --- a/libafl/Cargo.toml +++ b/libafl/Cargo.toml @@ -170,7 +170,7 @@ prometheus-client = { version = "0.22", optional = true } # For the prometheus m tide = { version = "0.16", optional = true } async-std = { version = "1.12", features = ["attributes"], optional = true } futures = { version = "0.3", optional = true } -log = { version = "0.4", features = ["release_max_level_info"] } +log = { version = "0.4" } tokio = { version = "1.38", optional = true, features = ["sync", "net", "rt", "io-util", "macros", "rt-multi-thread", "time"] } # used for TCP Event Manager and multi-machine enumflags2 = { version = "0.7", optional = true } diff --git a/libafl/src/corpus/ondisk.rs b/libafl/src/corpus/ondisk.rs index 273700d2ed..2ebbca339e 100644 --- a/libafl/src/corpus/ondisk.rs +++ b/libafl/src/corpus/ondisk.rs @@ -1,8 +1,8 @@ -//! The ondisk corpus stores all [`Testcase`]s to disk. -//! It never keeps any of them in memory. -//! This is a good solution for solutions that are never reused, and for very memory-constraint environments. +//! The [`OnDiskCorpus`] stores all [`Testcase`]s to disk. +//! It _never_ keeps any of them in memory. +//! This is a good solution for solutions that are never reused, or for *very* memory-constraint environments. //! For any other occasions, consider using [`crate::corpus::CachedOnDiskCorpus`] -//! which stores a certain number of testcases in memory and removes additional ones in a FIFO manner. +//! which stores a certain number of [`Testcase`]s in memory and removes additional ones in a FIFO manner. use alloc::string::String; use core::{cell::RefCell, time::Duration}; @@ -11,9 +11,8 @@ use std::path::{Path, PathBuf}; use libafl_bolts::serdeany::SerdeAnyMap; use serde::{Deserialize, Serialize}; -use super::{CachedOnDiskCorpus, HasTestcase}; use crate::{ - corpus::{Corpus, CorpusId, Testcase}, + corpus::{CachedOnDiskCorpus, Corpus, CorpusId, HasTestcase, Testcase}, inputs::{Input, UsesInput}, Error, }; diff --git a/libafl_bolts/Cargo.toml b/libafl_bolts/Cargo.toml index 704e4184cf..8532dfb6dd 100644 --- a/libafl_bolts/Cargo.toml +++ b/libafl_bolts/Cargo.toml @@ -113,7 +113,7 @@ rand_core = { version = "0.6", optional = true } nix = { version = "0.29", default-features = false, optional = true, features = ["signal", "socket", "poll"] } uuid = { version = "1.4", optional = true, features = ["serde", "v4"] } clap = { version = "4.5", features = ["derive", "wrap_help"], optional = true } # CLI parsing, for libafl_bolts::cli / the `cli` feature -log = { version = "0.4", features = ["release_max_level_info"] } +log = { version = "0.4" } pyo3 = { version = "0.18", optional = true, features = ["serde", "macros"] } diff --git a/utils/gdb_qemu/gdb_qemu/Cargo.toml b/utils/gdb_qemu/gdb_qemu/Cargo.toml index e2dbdab4de..8a3d9c09ad 100644 --- a/utils/gdb_qemu/gdb_qemu/Cargo.toml +++ b/utils/gdb_qemu/gdb_qemu/Cargo.toml @@ -10,7 +10,7 @@ vergen = { version = "8.1.1", features = ["build", "cargo", "git", "gitcl", "rus anyhow = { version = "1.0", default-features = false } clap = { version = "4.5", default-features = false, features = ["derive", "string", "std", "help", "derive", "error-context", "usage"] } libc = {version = "0.2", default-features = false } -log = { version = "0.4.20", default-features = false } +log = { version = "0.4", default-features = false } nix = { version = "0.29", default-features = false, features = ["signal", "fs"] } readonly = { version = "0.2.8", default-features = false } simplelog = { version = "0.12.1", default-features = false } diff --git a/utils/noaslr/noaslr/Cargo.toml b/utils/noaslr/noaslr/Cargo.toml index ffc331cdee..e168f62d77 100644 --- a/utils/noaslr/noaslr/Cargo.toml +++ b/utils/noaslr/noaslr/Cargo.toml @@ -9,7 +9,7 @@ vergen = { version = "8.1.1", features = ["build", "cargo", "git", "gitcl", "rus [dependencies] anyhow = { version = "1.0", default-features = false } clap = { version = "4.5", default-features = false, features = ["derive", "string", "std", "help", "derive", "error-context", "usage"] } -log = { version = "0.4.20", default-features = false } +log = { version = "0.4", default-features = false } nix = { version = "0.29", default-features = false, features = ["process", "personality"] } readonly = { version = "0.2.8", default-features = false } simplelog = { version = "0.12.1", default-features = false }