From e0fa74c89010762972007d486508ae7ffafa4ad9 Mon Sep 17 00:00:00 2001 From: Moudy Date: Sat, 16 Aug 2025 12:33:17 +0200 Subject: [PATCH] fixes --- chacha20-demo/.DS_Store | Bin 0 -> 8196 bytes chacha20-demo/methods/.DS_Store | Bin 0 -> 6148 bytes shake256-33bytes-demo/.gitignore | 4 + shake256-33bytes-demo/Cargo.toml | 9 +- shake256-33bytes-demo/build.rs | 2 +- shake256-33bytes-demo/methods/Cargo.toml | 2 +- shake256-33bytes-demo/methods/build.rs | 2 +- .../methods/guest/src/main.rs | 17 +++- shake256-33bytes-demo/methods/src/lib.rs | 1 + shake256-33bytes-demo/methods/src/main.rs | 83 ------------------ shake256-33bytes-demo/src/lib.rs | 27 +++--- shake256-33bytes-demo/src/main.rs | 3 +- 12 files changed, 38 insertions(+), 112 deletions(-) create mode 100644 chacha20-demo/.DS_Store create mode 100644 chacha20-demo/methods/.DS_Store create mode 100644 shake256-33bytes-demo/.gitignore create mode 100644 shake256-33bytes-demo/methods/src/lib.rs delete mode 100644 shake256-33bytes-demo/methods/src/main.rs diff --git a/chacha20-demo/.DS_Store b/chacha20-demo/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f7b9cb624c3928a9612fea2b426a9d6a2f111eaa GIT binary patch literal 8196 zcmeI1&uv8)Zi{l=%(A9W_OVTA>rn) zf5pU;@jvl@@uc7R(Pmko$HvG!GV_L=_vXiEW_Ni55wZ5z-zVB5A`40A>JG9MBI-q2 zl7hZ+2b#g3$fr7m#A(zEm#obNL%aSt>;S1M+Y()0zj8=SqjRC1Ei0wbxZ5H($W=es_21fSEfS@rrc3)3v=j})^nwm zJ2B->O!v%mgu-O+@Ux{kv6j*%Hv|lUWdb60uaHM$3J|$x;&(pqLhhkf+)&?<>VKr5 zB#r~J9x)}oFl)~qz~)=V{uUjROEHabHlR)j26VRQLr2&8r0_haaD`8HTqQb%T|#Nj zEZaqQ?Z$7!x0jrU-euYKUIoKRzk2VON2wb`!&o{5{tzZ_Uk8!T zCv85C{6zXXs=}&Rm45a9bb7eotl3WvXEl4;JZRMHX7gY+t5~}aA3r_mpM~cU|BMMh zn0~U-ZT0;s|AJBu!3QUfLLQBT8&ZW%fbxhs^c=blTz(GeZ&+m^-Nj}Yi-n>`NF1M# z1_1108%Ahh<#HE9f7w=wXd$LSt}n45+0Cb|G7ItJ#us9DItBY{m*FFZ4OzPkpHQi% zlEc3ZT64t$-;zkV735eD0f-@0VVch7K&_ bpO)5hrEvvv^9KP4Xqb8bOZX<+SOR|mwHj%d literal 0 HcmV?d00001 diff --git a/chacha20-demo/methods/.DS_Store b/chacha20-demo/methods/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..247a0f57a9f4af603db4f4b12ffc31938980bc80 GIT binary patch literal 6148 zcmeHK&u`N(6n#`Ev(--(=lEa8-w@+-2HCNzWx>+P=s}U zL>lY8gg>FotoffDdc4AsG@@g$obOS0CI9oE^5a=?%Hw~HPqVZryWMYMqtU!^b5m~0 zZTTiV*0ZpT%4so(Ca+BExz<^HQIFym>3BA5-#*ZJ8KwDnVhL$7M#}4#X`blWKu`0e zu-woEWJ|V&?K@Sqzt``mhx_x6s`|ZdNA>%?`Mf1}?mu|+Z1^ra$@RGvhXl4lYquCL z;3Fz)GQ1Bbd8YFt#0;-N1%w?fizDtKviJcwYeAAP*DlFURY8T{3i1K34ZBp3GX!}m zD>7J~cUPa&NcI$w%R{&rW-PTYycL~E$i~(cq z5D}PgRG^~@zG4VRN5A5{fU$Py=p^{^A^6FHZz#e(9pfvTP9kvVy;s01u&hACHQVO= ze{%W#f0^W4UIDMbf2DwE9)^blOo`9dwaJ;YR-wE_F=p~=hn51z$FZ%Lqxde0HN=#u W00YL_A$nl`kARiIJFmdCD)0mOTDSxN literal 0 HcmV?d00001 diff --git a/shake256-33bytes-demo/.gitignore b/shake256-33bytes-demo/.gitignore new file mode 100644 index 0000000..9e5faa4 --- /dev/null +++ b/shake256-33bytes-demo/.gitignore @@ -0,0 +1,4 @@ +/target +**/target +/target 2 +**/target 2 diff --git a/shake256-33bytes-demo/Cargo.toml b/shake256-33bytes-demo/Cargo.toml index 364a1ae..ff03999 100644 --- a/shake256-33bytes-demo/Cargo.toml +++ b/shake256-33bytes-demo/Cargo.toml @@ -24,12 +24,9 @@ rand = "0.8" cipher = { version = "0.4", features = ["std"] } serde = { version = "1", default-features = false, features = ["derive", "alloc"] } - -[build-dependencies] -risc0-build = "2.3.1" - [package.metadata.risc0] methods = ["methods/guest"] -[lints.rust] -unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] } \ No newline at end of file + +[build-dependencies] +risc0-build = "2.3.1" \ No newline at end of file diff --git a/shake256-33bytes-demo/build.rs b/shake256-33bytes-demo/build.rs index 08a8a4e..f23f0a5 100644 --- a/shake256-33bytes-demo/build.rs +++ b/shake256-33bytes-demo/build.rs @@ -1,3 +1,3 @@ fn main() { risc0_build::embed_methods(); -} +} \ No newline at end of file diff --git a/shake256-33bytes-demo/methods/Cargo.toml b/shake256-33bytes-demo/methods/Cargo.toml index 9ab59da..f5da0df 100644 --- a/shake256-33bytes-demo/methods/Cargo.toml +++ b/shake256-33bytes-demo/methods/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" risc0-build = { version = "2.3.1" } [package.metadata.risc0] -methods = ["methods/guest"] +methods = ["guest"] diff --git a/shake256-33bytes-demo/methods/build.rs b/shake256-33bytes-demo/methods/build.rs index 08a8a4e..f23f0a5 100644 --- a/shake256-33bytes-demo/methods/build.rs +++ b/shake256-33bytes-demo/methods/build.rs @@ -1,3 +1,3 @@ fn main() { risc0_build::embed_methods(); -} +} \ No newline at end of file diff --git a/shake256-33bytes-demo/methods/guest/src/main.rs b/shake256-33bytes-demo/methods/guest/src/main.rs index 61195de..f6504df 100644 --- a/shake256-33bytes-demo/methods/guest/src/main.rs +++ b/shake256-33bytes-demo/methods/guest/src/main.rs @@ -5,7 +5,7 @@ extern crate alloc; use alloc::vec::Vec; use risc0_zkvm::guest::env; use serde::{Deserialize, Serialize}; - + // ---------- module 1 ---------- mod ser_bytes33 { use core::fmt; @@ -70,20 +70,29 @@ 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() } pub fn enc_xor_shake256(key: &[u8; 32], info: &[u8], pt: &[u8]) -> Vec { let mut sh = Shake::v256(); - tiny_keccak::Hasher::update(&mut sh, b"NSSA/v0.1/shake-ks"); - tiny_keccak::Hasher::update(&mut sh, &key[..]); - tiny_keccak::Hasher::update(&mut sh, info); + sh.update(b"NSSA/v0.1/shake-ks"); + sh.update(&key[..]); + sh.update(info); let mut ks = vec![0u8; pt.len()]; sh.finalize(&mut ks); diff --git a/shake256-33bytes-demo/methods/src/lib.rs b/shake256-33bytes-demo/methods/src/lib.rs new file mode 100644 index 0000000..1bdb308 --- /dev/null +++ b/shake256-33bytes-demo/methods/src/lib.rs @@ -0,0 +1 @@ +include!(concat!(env!("OUT_DIR"), "/methods.rs")); diff --git a/shake256-33bytes-demo/methods/src/main.rs b/shake256-33bytes-demo/methods/src/main.rs deleted file mode 100644 index af9351d..0000000 --- a/shake256-33bytes-demo/methods/src/main.rs +++ /dev/null @@ -1,83 +0,0 @@ -#![no_std] -#![no_main] - -extern crate alloc; - -use alloc::vec::Vec; -use hkdf::Hkdf; -use risc0_zkvm::guest::env; -use risc0_zkvm::guest::entry; -use serde::{Deserialize, Serialize}; -use sha2::{Digest, Sha256}; -use sha3::{digest::{ExtendableOutput, Update, XofReader}, Shake256}; - -entry!(main); - - -#[derive(Debug, Serialize, Deserialize)] -pub struct EncInput { - pub plaintext: Vec, - pub ss_bytes: [u8; 32], - pub epk_bytes: Vec, - pub ipk_bytes: Vec, - pub commitment: [u8; 32], - pub out_index: u32, -} - -fn nssa_kdf( - ss_bytes: &[u8; 32], - epk: &[u8; 32], - ipk: &[u8; 32], - commitment: &[u8; 32], - out_index: u32, -) -> ([u8; 32], Vec) { - // salt = SHA256("NSSA/v0.1/KDF-SHA256") - let mut hasher = Sha256::new(); - hasher.update(b"NSSA/v0.1/KDF-SHA256"); - let salt = hasher.finalize(); - - let hk = Hkdf::::new(Some(&salt), ss_bytes); - - // info = "NSSA/v0.1/enc" || Epk || Ipk || commitment || le(out_index) - let mut info = Vec::with_capacity(3 + 33 + 33 + 32 + 4 + 16); - info.extend_from_slice(b"NSSA/v0.1/enc"); - info.extend_from_slice(epk); - info.extend_from_slice(ipk); - info.extend_from_slice(commitment); - info.extend_from_slice(&out_index.to_le_bytes()); - - let mut k_enc = [0u8; 32]; - hk.expand(&info, &mut k_enc).unwrap(); - - (k_enc, info) -} - -fn enc_xor_shake256(k_enc: &[u8; 32], ad: &[u8], pt: &[u8]) -> Vec { - let mut shake = Shake256::default(); - shake.update(b"NSSA/v0.1/ENC/SHAKE256"); - shake.update(k_enc); - shake.update(ad); - let mut xof = shake.finalize_xof(); - - let mut ks = vec![0u8; pt.len()]; - xof.read(&mut ks); - - pt.iter().zip(ks).map(|(p, k)| p ^ k).collect() -} - -pub fn main() { - let input: EncInput = env::read(); - - let (k_enc, info) = nssa_kdf( - &input.ss_bytes, - &input.epk_compressed, - &input.ipk_compressed, - &input.commitment, - input.out_index, - ); - - let ct = enc_xor_shake256(&k_enc, &info, &input.plaintext); - - // Commit ciphertext to the journal - env::commit_slice(&ct); -} \ No newline at end of file diff --git a/shake256-33bytes-demo/src/lib.rs b/shake256-33bytes-demo/src/lib.rs index 2bffbc1..044f796 100644 --- a/shake256-33bytes-demo/src/lib.rs +++ b/shake256-33bytes-demo/src/lib.rs @@ -1,11 +1,9 @@ -use serde::{Deserialize, Serialize}; - -// ---------- expose generated guest constants ---------- -pub mod methods { +pub mod methods { include!(concat!(env!("OUT_DIR"), "/methods.rs")); } -// ------------------------------------------------------- + +use serde::{Deserialize, Serialize}; // ---------- 33-byte wrapper (public) ---------- pub mod ser_bytes33 { // (public so main.rs can use it) use core::fmt; @@ -61,20 +59,20 @@ pub mod crypto { // makes the module public out_index: u32, ) -> [u8; 32] { let mut hasher = Sha256::new(); - sha2::Digest::update(&mut hasher, 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()); hasher.finalize().into() } pub fn enc_xor_shake256(key: &[u8; 32], info: &[u8], pt: &[u8]) -> Vec { let mut sh = Shake::v256(); - tiny_keccak::Hasher::update(&mut sh, b"NSSA/v0.1/shake-ks"); - tiny_keccak::Hasher::update(&mut sh, &key[..]); - tiny_keccak::Hasher::update(&mut sh, info); + sh.update(b"NSSA/v0.1/shake-ks"); + sh.update(&key[..]); + sh.update(info); let mut ks = vec![0u8; pt.len()]; sh.finalize(&mut ks); @@ -100,6 +98,7 @@ pub struct EncInput { pub commitment: [u8; 32], pub out_index: u32, } + // ------------------------------------------------------------ pub fn build_info(epk: &Bytes33, ipk: &Bytes33) -> Vec { diff --git a/shake256-33bytes-demo/src/main.rs b/shake256-33bytes-demo/src/main.rs index 50532da..b6e7f26 100644 --- a/shake256-33bytes-demo/src/main.rs +++ b/shake256-33bytes-demo/src/main.rs @@ -35,8 +35,7 @@ fn main() -> anyhow::Result<()> { 0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38, 0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,0x40, ]; - - let input = EncInput { +let input = EncInput { ss_bytes, epk_bytes: Bytes33::from(epk_raw), ipk_bytes: Bytes33::from(ipk_raw),