mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-24 23:08:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix PaymentReceived/sha256 handling in full_stack_target

Browse source 
Sha256 in fuzztarget was updated some time ago to use XOR instead
of the first byte of a real SHA256 run and somehow received and
sent payments got crossed in full_stack_target.
This commit is contained in:
Matt Corallo 2018-08-16 10:31:10 -04:00
parent 609054eae0
commit 09583f3116
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
fuzz/fuzz_targets/full_stack_target.rs
View file

@ -10,7 +10,6 @@ use bitcoin::network::constants::Network;
use bitcoin::network::serialize::{serialize, BitcoinHash}; use bitcoin::network::serialize::{serialize, BitcoinHash};
use bitcoin::util::hash::Sha256dHash; use bitcoin::util::hash::Sha256dHash;
use crypto::sha2::Sha256;
use crypto::digest::Digest; use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil}; use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
@ -22,6 +21,7 @@ use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event}; use lightning::util::events::{EventsProvider,Event};
use lightning::util::reset_rng_state; use lightning::util::reset_rng_state;
use lightning::util::logger::Logger; use lightning::util::logger::Logger;
use lightning::util::sha2::Sha256;
mod utils; mod utils;
@ -189,7 +189,7 @@ pub fn do_test(data: &[u8]) {
}, our_network_key, Arc::clone(&logger)); }, our_network_key, Arc::clone(&logger));
let mut should_forward = false; let mut should_forward = false;
let mut payments_received = Vec::new(); let mut payments_received: Vec<[u8; 32]> = Vec::new();
let mut payments_sent = 0; let mut payments_sent = 0;
let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new(); let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
let mut pending_funding_signatures = HashMap::new(); let mut pending_funding_signatures = HashMap::new();
@ -246,7 +246,6 @@ pub fn do_test(data: &[u8]) {
let mut sha = Sha256::new(); let mut sha = Sha256::new();
sha.input(&payment_hash); sha.input(&payment_hash);
sha.result(&mut payment_hash); sha.result(&mut payment_hash);
for i in 1..32 { payment_hash[i] = 0; }
payments_sent += 1; payments_sent += 1;
match channelmanager.send_payment(route, payment_hash) { match channelmanager.send_payment(route, payment_hash) {
Ok(_) => {}, Ok(_) => {},
@ -276,22 +275,14 @@ pub fn do_test(data: &[u8]) {
}, },
8 => { 8 => {
for payment in payments_received.drain(..) { for payment in payments_received.drain(..) {
let mut payment_preimage = None; let mut payment_preimage = [0; 32];
for i in 0..payments_sent { payment_preimage[0] = payment[0];
let mut payment_hash = [0; 32]; let mut sha = Sha256::new();
payment_hash[0..8].copy_from_slice(&be64_to_array(i)); sha.input(&payment_preimage);
let mut sha = Sha256::new(); let mut payment_hash_check = [0; 32];
sha.input(&payment_hash); sha.result(&mut payment_hash_check);
sha.result(&mut payment_hash); assert!(payment_hash_check == payment);
for i in 1..32 { payment_hash[i] = 0; } channelmanager.claim_funds(payment_preimage);
if payment_hash == payment {
payment_hash = [0; 32];
payment_hash[0..8].copy_from_slice(&be64_to_array(i));
payment_preimage = Some(payment_hash);
break;
}
}
channelmanager.claim_funds(payment_preimage.unwrap());
} }
}, },
9 => { 9 => {

6
src/util/mod.rs
View file

@ -4,9 +4,13 @@ pub(crate) mod byte_utils;
pub(crate) mod chacha20poly1305rfc; pub(crate) mod chacha20poly1305rfc;
pub(crate) mod internal_traits; pub(crate) mod internal_traits;
pub(crate) mod rng; pub(crate) mod rng;
pub(crate) mod sha2;
pub(crate) mod transaction_utils; pub(crate) mod transaction_utils;
#[cfg(feature = "fuzztarget")]
pub mod sha2;
#[cfg(not(feature = "fuzztarget"))]
pub(crate) mod sha2;
#[cfg(feature = "fuzztarget")] #[cfg(feature = "fuzztarget")]
pub use self::rng::reset_rng_state; pub use self::rng::reset_rng_state;