]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Shorten channelmonitor_deserialize_target's name for AFL
authorMatt Corallo <git@bluematt.me>
Wed, 18 Jul 2018 18:36:24 +0000 (14:36 -0400)
committerMatt Corallo <git@bluematt.me>
Wed, 18 Jul 2018 18:36:48 +0000 (14:36 -0400)
fuzz/Cargo.toml
fuzz/fuzz_targets/chanmon_deser_target.rs [new file with mode: 0644]
fuzz/fuzz_targets/channelmonitor_deserialize_target.rs [deleted file]

index 8e2d76ce47a71c7e65d8adf6b004c02b23f758aa..ac5373b7b18036148686dfa0d9bfe9c9a3eab1d6 100644 (file)
@@ -43,8 +43,8 @@ name = "full_stack_target"
 path = "fuzz_targets/full_stack_target.rs"
 
 [[bin]]
-name = "channelmonitor_deserialize_target"
-path = "fuzz_targets/channelmonitor_deserialize_target.rs"
+name = "chanmon_deser_target"
+path = "fuzz_targets/chanmon_deser_target.rs"
 
 # message fuzz targets
 [[bin]]
diff --git a/fuzz/fuzz_targets/chanmon_deser_target.rs b/fuzz/fuzz_targets/chanmon_deser_target.rs
new file mode 100644 (file)
index 0000000..0bf8617
--- /dev/null
@@ -0,0 +1,63 @@
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+extern crate lightning;
+
+use lightning::ln::channelmonitor;
+use lightning::util::reset_rng_state;
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+       reset_rng_state();
+       if let Some(monitor) = channelmonitor::ChannelMonitor::deserialize(data) {
+               assert!(channelmonitor::ChannelMonitor::deserialize(&monitor.serialize_for_disk()[..]).unwrap() == monitor);
+               monitor.serialize_for_watchtower();
+       }
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+       afl::read_stdio_bytes(|data| {
+               do_test(&data);
+       });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+       loop {
+               fuzz!(|data| {
+                       do_test(data);
+               });
+       }
+}
+
+#[cfg(test)]
+mod tests {
+       fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+               let mut b = 0;
+               for (idx, c) in hex.as_bytes().iter().enumerate() {
+                       b <<= 4;
+                       match *c {
+                               b'A'...b'F' => b |= c - b'A' + 10,
+                               b'a'...b'f' => b |= c - b'a' + 10,
+                               b'0'...b'9' => b |= c - b'0',
+                               _ => panic!("Bad hex"),
+                       }
+                       if (idx & 1) == 1 {
+                               out.push(b);
+                               b = 0;
+                       }
+               }
+       }
+
+       #[test]
+       fn duplicate_crash() {
+               let mut a = Vec::new();
+               extend_vec_from_hex("00", &mut a);
+               super::do_test(&a);
+       }
+}
diff --git a/fuzz/fuzz_targets/channelmonitor_deserialize_target.rs b/fuzz/fuzz_targets/channelmonitor_deserialize_target.rs
deleted file mode 100644 (file)
index 0bf8617..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is auto-generated by gen_target.sh based on msg_target_template.txt
-// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
-
-extern crate lightning;
-
-use lightning::ln::channelmonitor;
-use lightning::util::reset_rng_state;
-
-#[inline]
-pub fn do_test(data: &[u8]) {
-       reset_rng_state();
-       if let Some(monitor) = channelmonitor::ChannelMonitor::deserialize(data) {
-               assert!(channelmonitor::ChannelMonitor::deserialize(&monitor.serialize_for_disk()[..]).unwrap() == monitor);
-               monitor.serialize_for_watchtower();
-       }
-}
-
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-       afl::read_stdio_bytes(|data| {
-               do_test(&data);
-       });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use] extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
-fn main() {
-       loop {
-               fuzz!(|data| {
-                       do_test(data);
-               });
-       }
-}
-
-#[cfg(test)]
-mod tests {
-       fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-               let mut b = 0;
-               for (idx, c) in hex.as_bytes().iter().enumerate() {
-                       b <<= 4;
-                       match *c {
-                               b'A'...b'F' => b |= c - b'A' + 10,
-                               b'a'...b'f' => b |= c - b'a' + 10,
-                               b'0'...b'9' => b |= c - b'0',
-                               _ => panic!("Bad hex"),
-                       }
-                       if (idx & 1) == 1 {
-                               out.push(b);
-                               b = 0;
-                       }
-               }
-       }
-
-       #[test]
-       fn duplicate_crash() {
-               let mut a = Vec::new();
-               extend_vec_from_hex("00", &mut a);
-               super::do_test(&a);
-       }
-}