From 7578fbd790b763ffde5b34a52d242ea98cd3ffa7 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Tue, 27 Oct 2020 01:18:18 +0100 Subject: [PATCH] renamed Afl stuff --- src/corpus/mod.rs | 22 +++++++++++----------- src/inputs/bytes.rs | 6 +++--- src/inputs/mod.rs | 10 +++++----- src/lib.rs | 2 +- src/utils.rs | 14 +++++++------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/corpus/mod.rs b/src/corpus/mod.rs index a332b0b2fc..44d01f5cd1 100644 --- a/src/corpus/mod.rs +++ b/src/corpus/mod.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; use std::collections::HashMap; -use crate::AflError; +use crate::Error; use crate::utils::Rand; use crate::inputs::Input; @@ -10,7 +10,7 @@ pub trait TestcaseMetadata: Debug { pub trait Testcase: Debug { - fn load_input(&mut self) -> Result<&Box, AflError>; + fn load_input(&mut self) -> Result<&Box, Error>; fn is_on_disk(&self) -> bool; fn get_filename(&self) -> &str; fn get_metadatas(&mut self) -> &mut HashMap>; @@ -29,10 +29,10 @@ pub trait Corpus: Debug { fn remove(&mut self, entry: &dyn Testcase) -> Option>; /// Gets a random entry - fn random_entry(&mut self) -> Result<&Box, AflError>; + fn random_entry(&mut self) -> Result<&Box, Error>; /// Gets the next entry - fn get(&mut self) -> Result<&Box, AflError>; + fn get(&mut self) -> Result<&Box, Error>; } @@ -84,15 +84,15 @@ impl Corpus for DefaultQueue<'_> { } /// Gets a random entry - fn random_entry(&mut self) -> Result<&Box, AflError> { + fn random_entry(&mut self) -> Result<&Box, Error> { let id = self.rand.below(self.entries.len() as u64) as usize; Ok(self.entries.get_mut(id).unwrap()) } /// Gets the next entry - fn get(&mut self) -> Result<&Box, AflError> { + fn get(&mut self) -> Result<&Box, Error> { if self.entries.len() == 0 { - return Err(AflError::Unknown) + return Err(Error::Unknown) } self.pos = self.pos + 1; if self.pos >= self.entries.len() { @@ -140,9 +140,9 @@ struct SimpleTestcase { impl Testcase for SimpleTestcase { - fn load_input(&mut self) -> Result<&Box, AflError> { + fn load_input(&mut self) -> Result<&Box, Error> { // TODO: Implement - Err(AflError::Unknown) + Err(Error::Unknown) } fn is_on_disk(&self) -> bool { @@ -174,11 +174,11 @@ mod tests { use crate::corpus::Corpus; use crate::corpus::DefaultQueue; use crate::corpus::SimpleTestcase; - use crate::utils::AflRand; + use crate::utils::Xoshiro256StarRand; #[test] fn test_defaultqueue() { - let mut rand = AflRand::new(); + let mut rand = Xoshiro256StarRand::new(); let mut q = DefaultQueue::new(&mut rand, "fancy/path"); q.add(Box::new(SimpleTestcase::new("fancyfile"))); let filename = q.get().unwrap().get_filename().to_owned(); diff --git a/src/inputs/bytes.rs b/src/inputs/bytes.rs index ac3b80f020..8f02b72061 100644 --- a/src/inputs/bytes.rs +++ b/src/inputs/bytes.rs @@ -1,4 +1,4 @@ -use crate::AflError; +use crate::Error; use crate::inputs::Input; #[derive(Clone, Debug, Default)] @@ -8,10 +8,10 @@ pub struct BytesInput { impl Input for BytesInput { - fn serialize(&self) -> Result<&[u8], AflError> { + fn serialize(&self) -> Result<&[u8], Error> { Ok(&self.bytes) } - fn deserialize(&mut self, buf: &[u8]) -> Result<(), AflError> { + fn deserialize(&mut self, buf: &[u8]) -> Result<(), Error> { self.bytes.truncate(0); self.bytes.extend_from_slice(buf); Ok(()) diff --git a/src/inputs/mod.rs b/src/inputs/mod.rs index 4d1be063e4..339c2d079e 100644 --- a/src/inputs/mod.rs +++ b/src/inputs/mod.rs @@ -4,17 +4,17 @@ use std::fs::File; use std::io::Write; use std::io::Read; -use crate::AflError; +use crate::Error; pub trait Input { - fn to_file(&self, path: &str) -> Result<(), AflError> { + fn to_file(&self, path: &str) -> Result<(), Error> { let mut file = File::create(path)?; file.write_all(self.serialize()?)?; Ok(()) } - fn from_file(&mut self, path: &str) -> Result<(), AflError> { + fn from_file(&mut self, path: &str) -> Result<(), Error> { let mut file = File::create(path)?; let mut buf = vec![]; file.read_to_end(&mut buf)?; @@ -22,8 +22,8 @@ pub trait Input { Ok(()) } - fn serialize(&self) -> Result<&[u8], AflError>; + fn serialize(&self) -> Result<&[u8], Error>; - fn deserialize(&mut self, buf: &[u8]) -> Result<(), AflError>; + fn deserialize(&mut self, buf: &[u8]) -> Result<(), Error>; } \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index dcea1eeb23..ffc31b1aa7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ pub mod stages; pub mod utils; #[derive(Error, Debug)] -pub enum AflError { +pub enum Error { #[error("Error in Serialization: `{0}`")] Serialize(String), #[error("File IO failed")] diff --git a/src/utils.rs b/src/utils.rs index 2109930efd..8356dd28b8 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -47,7 +47,7 @@ const HASH_CONST: u64 = 0xa5b35705; /// XXH3 Based, hopefully speedy, rnd implementation /// #[derive(Copy, Clone, Debug, Default)] -pub struct AflRand { +pub struct Xoshiro256StarRand { rand_seed: [u64; 4], @@ -55,7 +55,7 @@ pub struct AflRand { } -impl Rand for AflRand { +impl Rand for Xoshiro256StarRand { @@ -88,11 +88,11 @@ impl Rand for AflRand { } -impl AflRand { +impl Xoshiro256StarRand { - pub fn new() -> AflRand { + pub fn new() -> Xoshiro256StarRand { - let mut ret: AflRand = Default::default(); + let mut ret: Xoshiro256StarRand = Default::default(); ret.set_seed(0); // TODO: Proper random seed? ret } @@ -116,11 +116,11 @@ fn next_pow2(val: u64) -> u64 { #[cfg(test)] mod tests { - use crate::utils::{Rand, AflRand, next_pow2}; + use crate::utils::{Rand, Xoshiro256StarRand, next_pow2}; #[test] fn test_rand() { - let mut rand = AflRand::new(); + let mut rand = Xoshiro256StarRand::new(); assert_ne!(rand.next(), rand.next()); assert!(rand.below(100) < 100); assert_eq!(rand.below(1), 0);