Skip to content

Commit d7bb532

Browse files
committed
Add explicit compile errors when cfg=fuzzing is mis-set
1 parent ba361cc commit d7bb532

38 files changed

+114
-0
lines changed

fuzz/src/bin/chanmon_consistency_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::chanmon_consistency::*;
1720

fuzz/src/bin/chanmon_deser_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::chanmon_deser::*;
1720

fuzz/src/bin/full_stack_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::full_stack::*;
1720

fuzz/src/bin/msg_accept_channel_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_accept_channel::*;
1720

fuzz/src/bin/msg_announcement_signatures_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_announcement_signatures::*;
1720

fuzz/src/bin/msg_channel_announcement_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_channel_announcement::*;
1720

fuzz/src/bin/msg_channel_reestablish_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_channel_reestablish::*;
1720

fuzz/src/bin/msg_channel_update_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_channel_update::*;
1720

fuzz/src/bin/msg_closing_signed_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_closing_signed::*;
1720

fuzz/src/bin/msg_commitment_signed_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_commitment_signed::*;
1720

fuzz/src/bin/msg_decoded_onion_error_packet_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_decoded_onion_error_packet::*;
1720

fuzz/src/bin/msg_error_message_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_error_message::*;
1720

fuzz/src/bin/msg_funding_created_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_funding_created::*;
1720

fuzz/src/bin/msg_funding_locked_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_funding_locked::*;
1720

fuzz/src/bin/msg_funding_signed_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_funding_signed::*;
1720

fuzz/src/bin/msg_gossip_timestamp_filter_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_gossip_timestamp_filter::*;
1720

fuzz/src/bin/msg_init_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_init::*;
1720

fuzz/src/bin/msg_node_announcement_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_node_announcement::*;
1720

fuzz/src/bin/msg_onion_hop_data_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_onion_hop_data::*;
1720

fuzz/src/bin/msg_open_channel_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_open_channel::*;
1720

fuzz/src/bin/msg_ping_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_ping::*;
1720

fuzz/src/bin/msg_pong_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_pong::*;
1720

fuzz/src/bin/msg_query_channel_range_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_query_channel_range::*;
1720

fuzz/src/bin/msg_query_short_channel_ids_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_query_short_channel_ids::*;
1720

fuzz/src/bin/msg_reply_channel_range_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_reply_channel_range::*;
1720

fuzz/src/bin/msg_reply_short_channel_ids_end_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_reply_short_channel_ids_end::*;
1720

fuzz/src/bin/msg_revoke_and_ack_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_revoke_and_ack::*;
1720

fuzz/src/bin/msg_shutdown_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_shutdown::*;
1720

fuzz/src/bin/msg_update_add_htlc_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_update_add_htlc::*;
1720

fuzz/src/bin/msg_update_fail_htlc_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_update_fail_htlc::*;
1720

fuzz/src/bin/msg_update_fail_malformed_htlc_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_update_fail_malformed_htlc::*;
1720

fuzz/src/bin/msg_update_fee_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_update_fee::*;
1720

fuzz/src/bin/msg_update_fulfill_htlc_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::msg_targets::msg_update_fulfill_htlc::*;
1720

fuzz/src/bin/peer_crypt_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::peer_crypt::*;
1720

fuzz/src/bin/router_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::router::*;
1720

fuzz/src/bin/target_template.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::TARGET_MOD::*;
1720

fuzz/src/bin/zbase32_target.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
1414

15+
#[cfg(not(fuzzing))]
16+
compile_error!("Fuzz targets need cfg=fuzzing");
17+
1518
extern crate lightning_fuzz;
1619
use lightning_fuzz::zbase32::*;
1720

lightning/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
#[cfg(not(any(feature = "std", feature = "no-std")))]
3737
compile_error!("at least one of the `std` or `no-std` features must be enabled");
3838

39+
#[cfg(all(fuzzing, test))]
40+
compile_error!("Tests will always fail with cfg=fuzzing");
41+
3942
#[macro_use]
4043
extern crate alloc;
4144
extern crate bitcoin;

0 commit comments

Comments
 (0)