Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added chacha20-demo/.DS_Store
Binary file not shown.
Binary file added chacha20-demo/methods/.DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions shake256-33bytes-demo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/target
**/target
/target 2
**/target 2
32 changes: 32 additions & 0 deletions shake256-33bytes-demo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[package]
name = "shake256-33bytes-demo"
version = "0.1.0"
edition = "2021"
build = "build.rs"

[[bin]]
name = "shake256-33bytes-demo"
path = "src/main.rs"

[dependencies]
risc0-zkvm = { version = "2.3.1", features = ["std", "prove"] }
anyhow = "1.0"
hex = "0.4"
serde = { version = "1.0", features = ["derive"] }
sha2 = "0.10"
hkdf = "0.12"
sha3 = "0.10"
serde-big-array = "0.5"
tiny-keccak = { version = "2", default-features = false, features = ["shake"] } # ADD

[dev-dependencies]
rand = "0.8"
cipher = { version = "0.4", features = ["std"] }
serde = { version = "1", default-features = false, features = ["derive", "alloc"] }

[package.metadata.risc0]
methods = ["methods/guest"]
# methods = {path = "methods"}

[build-dependencies]
risc0-build = "2.3.1"
3 changes: 3 additions & 0 deletions shake256-33bytes-demo/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
risc0_build::embed_methods();
}
11 changes: 11 additions & 0 deletions shake256-33bytes-demo/methods/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "methods"
version = "0.1.0"
edition = "2021"

[build-dependencies]
risc0-build = { version = "2.3.1" }

[package.metadata.risc0]
methods = ["guest"]

3 changes: 3 additions & 0 deletions shake256-33bytes-demo/methods/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
risc0_build::embed_methods();
}
14 changes: 14 additions & 0 deletions shake256-33bytes-demo/methods/guest/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[package]
name = "guest"
version = "0.1.0"
edition = "2021"

[workspace]

[dependencies]
risc0-zkvm = { version = "2.3.1", default-features = false}
serde = { version = "1", default-features = false, features = ["derive", "alloc"] }
sha2 = { version = "0.10", default-features = false }
hkdf = { version = "0.12", default-features = false }
sha3 = { version = "0.10", default-features = false }
tiny-keccak = { version = "2", default-features = false, features = ["shake"] } # ADD
132 changes: 132 additions & 0 deletions shake256-33bytes-demo/methods/guest/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
#![no_std]
#![no_main]
extern crate alloc;

use alloc::vec::Vec;
use risc0_zkvm::guest::env;
use serde::{Deserialize, Serialize};

// ---------- module 1 ----------
mod ser_bytes33 {
use core::fmt;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde::de::{self, SeqAccess, Visitor};

#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub struct Bytes33(pub [u8; 33]);

impl Serialize for Bytes33 {
fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
s.serialize_bytes(&self.0)
}
}
impl<'de> Deserialize<'de> for Bytes33 {
fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
struct V;
impl<'de> Visitor<'de> for V {
type Value = Bytes33;
fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "exactly 33 bytes")
}
fn visit_bytes<E: de::Error>(self, v: &[u8]) -> Result<Self::Value, E> {
if v.len() != 33 { return Err(E::invalid_length(v.len(), &"33 bytes")); }
let mut a = [0u8; 33];
a.copy_from_slice(v);
Ok(Bytes33(a))
}
fn visit_seq<A: SeqAccess<'de>>(self, mut seq: A) -> Result<Self::Value, A::Error> {
let mut a = [0u8; 33];
for i in 0..33 {
a[i] = seq.next_element()?
.ok_or_else(|| de::Error::invalid_length(i, &"33 bytes"))?;
}
Ok(Bytes33(a))
}
}
d.deserialize_bytes(V)
}
}
impl AsRef<[u8; 33]> for Bytes33 { fn as_ref(&self) -> &[u8; 33] { &self.0 } }
impl AsRef<[u8]> for Bytes33 { fn as_ref(&self) -> &[u8] { &self.0 } }
}
use ser_bytes33::Bytes33; // bring into crate scope
// ---------- end module 1 ----------

// ---------- module 2 ----------
mod crypto {
#![allow(clippy::needless_borrows_for_generic_args)]

extern crate alloc;
use alloc::vec;
use alloc::vec::Vec;
use sha2::{Digest, Sha256};
use tiny_keccak::{Hasher, Shake};

pub fn nssa_kdf(
ss_bytes: [u8; 32],
epk: &[u8; 33],
ipk: &[u8; 33],
commitment: &[u8; 32],
out_index: u32,
) -> [u8; 32] {
let mut hasher = Sha256::new();

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<u8> {
let mut sh = Shake::v256();
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);

let mut ct = vec![0u8; pt.len()];
for (i, &b) in pt.iter().enumerate() {
ct[i] = b ^ ks[i];
}
ct
}
}
use crypto::{enc_xor_shake256, nssa_kdf};
// ---------- end module 2 ----------

// ---------- plain types at crate root ----------
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct EncInput {
pub ss_bytes: [u8; 32],
pub epk_bytes: Bytes33,
pub ipk_bytes: Bytes33,
pub commitment: [u8; 32],
pub out_index: u32,
}
Comment on lines +104 to +111
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a workaround to get rid of the ser_bytes33 module and the Bytes33 struct.
The issues you had with 33 bytes come from trying to derive Serialize and Deserialize for EncInput. Since you only need a way to convert an instance of EncInput to bytes, you can make it work by implementing those manually.

Suggested change
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct EncInput {
pub ss_bytes: [u8; 32],
pub epk_bytes: Bytes33,
pub ipk_bytes: Bytes33,
pub commitment: [u8; 32],
pub out_index: u32,
}
#[derive(Debug, Clone)]
pub struct EncInput {
pub ss_bytes: [u8; 32],
pub epk_bytes: [u8; 33],
pub ipk_bytes: [u8; 33],
pub commitment: [u8; 32],
pub out_index: u32,
}
impl EncInput {
pub fn to_bytes(&self) -> Vec<u8> {
let mut bytes = Vec::with_capacity(32 + 33 + 33 + 32 + 4);
bytes.extend_from_slice(&self.ss_bytes);
bytes.extend_from_slice(&self.epk_bytes);
bytes.extend_from_slice(&self.ipk_bytes);
bytes.extend_from_slice(&self.commitment);
bytes.extend_from_slice(&self.out_index.to_le_bytes());
bytes
}
fn from_bytes(bytes: Vec<u8>) -> EncInput {
assert_eq!(bytes.len(), 32 + 33 + 33 + 32 + 4);
let ss_bytes = bytes[0..32].try_into().unwrap();
let epk_bytes = bytes[32..65].try_into().unwrap();
let ipk_bytes = bytes[65..98].try_into().unwrap();
let commitment = bytes[98..130].try_into().unwrap();
let out_index = u32::from_le_bytes(bytes[130..134].try_into().unwrap());
EncInput {
ss_bytes,
epk_bytes,
ipk_bytes,
commitment,
out_index,
}
}
}

Then in src/main.rs when writing inputs to the guets program you can do the following

    let input_bytes = input.to_bytes();
    let env = ExecutorEnv::builder().write(&input_bytes.as_slice())?.build()?;

Inside the guest program, we read it as follows:

    let input_bytes: Vec<u8> = env::read();
    let EncInput { ss_bytes, epk_bytes, ipk_bytes, commitment, out_index } = EncInput::from_bytes(input_bytes);

// ---------- end types ----------

// ---------- entrypoint at crate root ----------
risc0_zkvm::guest::entry!(guest_main);

pub fn guest_main() {
let EncInput { ss_bytes, epk_bytes, ipk_bytes, commitment, out_index } = env::read();

let mut info: Vec<u8> = Vec::new();
info.extend_from_slice(epk_bytes.as_ref());
info.extend_from_slice(ipk_bytes.as_ref());
info.extend_from_slice(&commitment);

let k_enc = nssa_kdf(ss_bytes, epk_bytes.as_ref(), ipk_bytes.as_ref(), &commitment, out_index);

let pt: &[u8] = b"hello";
let ct = enc_xor_shake256(&k_enc, &info, pt);

env::commit_slice(&ct);
}
// ---------- end entry ----------
1 change: 1 addition & 0 deletions shake256-33bytes-demo/methods/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include!(concat!(env!("OUT_DIR"), "/methods.rs"));
115 changes: 115 additions & 0 deletions shake256-33bytes-demo/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
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;
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};

#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub struct Bytes33(pub [u8; 33]);

impl Serialize for Bytes33 {
fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
s.serialize_bytes(&self.0)
}
}
impl<'de> Deserialize<'de> for Bytes33 {
fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
struct V;
impl<'de> de::Visitor<'de> for V {
type Value = Bytes33;
fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "exactly 33 bytes")
}
fn visit_bytes<E: de::Error>(self, v: &[u8]) -> Result<Self::Value, E> {
if v.len() != 33 { return Err(E::invalid_length(v.len(), &"33 bytes")); }
let mut a = [0u8; 33];
a.copy_from_slice(v);
Ok(Bytes33(a))
}
}
d.deserialize_bytes(V)
}
}
impl AsRef<[u8; 33]> for Bytes33 { fn as_ref(&self) -> &[u8; 33] { &self.0 } }
impl AsRef<[u8]> for Bytes33 { fn as_ref(&self) -> &[u8] { &self.0 } }

// this is an optional QoL: it allows `epk_bytes.into()` from a plain array
impl From<[u8; 33]> for Bytes33 {
fn from(a: [u8; 33]) -> Self { Bytes33(a) }
}
}
pub use ser_bytes33::Bytes33; // re-export
// --------------------------------------------------

// ---------- crypto (public) ----------
pub mod crypto { // makes the module public
use sha2::{Digest, Sha256};
use tiny_keccak::{Hasher, Shake};

pub fn nssa_kdf( // keeps public
ss_bytes: [u8; 32],
epk: &[u8; 33],
ipk: &[u8; 33],
commitment: &[u8; 32],
out_index: u32,
) -> [u8; 32] {
let mut hasher = Sha256::new();
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<u8> {
let mut sh = Shake::v256();
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);

let mut ct = vec![0u8; pt.len()];
for (i, &b) in pt.iter().enumerate() {
ct[i] = b ^ ks[i];
}
ct
}
}

// Re-export so callers can `use shake256_demo::{enc_xor_shake256, nssa_kdf};`
pub use crypto::{enc_xor_shake256, nssa_kdf};
// ------------------------------------------------------------

// ---------- types ----------
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct EncInput {
pub ss_bytes: [u8; 32],
pub epk_bytes: Bytes33,
pub ipk_bytes: Bytes33,
pub commitment: [u8; 32],
pub out_index: u32,
}

// ------------------------------------------------------------

pub fn build_info(epk: &Bytes33, ipk: &Bytes33) -> Vec<u8> {
let mut info = Vec::with_capacity(66);
info.extend_from_slice(epk.as_ref());
info.extend_from_slice(ipk.as_ref());
info
}

pub fn example_use(input: &EncInput) -> ([u8; 32], Vec<u8>) {
let info = build_info(&input.epk_bytes, &input.ipk_bytes);
let k: [u8; 32] = [0u8; 32];
(k, info)
}
Loading