From 4333bb66a79a43e708769927bf7ac4484d43da32 Mon Sep 17 00:00:00 2001 From: Moudy Date: Sat, 16 Aug 2025 13:01:35 +0200 Subject: [PATCH] removed conflict paragraph --- shake256-33bytes-demo/methods/guest/src/main.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/shake256-33bytes-demo/methods/guest/src/main.rs b/shake256-33bytes-demo/methods/guest/src/main.rs index f6504df..c46f762 100644 --- a/shake256-33bytes-demo/methods/guest/src/main.rs +++ b/shake256-33bytes-demo/methods/guest/src/main.rs @@ -70,21 +70,14 @@ mod crypto { out_index: u32, ) -> [u8; 32] { let mut hasher = Sha256::new(); -<<<<<<< HEAD - hasher.update( b"NSSA/v0.1/KDF-SHA256"); - sha2::Digest::update(&mut hasher, &ss_bytes); - sha2::Digest::update(&mut hasher, &epk[..]); - sha2::Digest::update(&mut hasher, &ipk[..]); - sha2::Digest::update(&mut hasher, &commitment[..]); - sha2::Digest::update(&mut hasher, &out_index.to_le_bytes()); -======= + hasher.update(b"NSSA/v0.1/KDF-SHA256"); hasher.update(&ss_bytes); hasher.update(&epk[..]); hasher.update(&ipk[..]); hasher.update(&commitment[..]); hasher.update(&out_index.to_le_bytes()); ->>>>>>> 998382a (fixes) + hasher.finalize().into() }