From 07146d9914da562782a9339f35e7f68f12d10517 Mon Sep 17 00:00:00 2001 From: Katherine Watson Date: Fri, 21 Jun 2024 18:21:33 -0700 Subject: [PATCH] fix: update handle_msg.rs fuzz test and handshake.rs bench to use PublicBox --- fuzz/fuzz_targets/handle_msg.rs | 4 ++-- rosenpass/benches/handshake.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fuzz/fuzz_targets/handle_msg.rs b/fuzz/fuzz_targets/handle_msg.rs index 9fce5fb..6423fe7 100644 --- a/fuzz/fuzz_targets/handle_msg.rs +++ b/fuzz/fuzz_targets/handle_msg.rs @@ -7,14 +7,14 @@ use rosenpass::protocol::CryptoServer; use rosenpass_cipher_traits::Kem; use rosenpass_ciphers::kem::StaticKem; use rosenpass_secret_memory::policy::*; -use rosenpass_secret_memory::Secret; +use rosenpass_secret_memory::{PublicBox, Secret}; use std::sync::Once; static ONCE: Once = Once::new(); fuzz_target!(|rx_buf: &[u8]| { ONCE.call_once(secret_policy_use_only_malloc_secrets); let sk = Secret::from_slice(&[0; StaticKem::SK_LEN]); - let pk = Secret::from_slice(&[0; StaticKem::PK_LEN]); + let pk = PublicBox::from_slice(&[0; StaticKem::PK_LEN]); let mut cs = CryptoServer::new(sk, pk); let mut tx_buf = [0; 10240]; diff --git a/rosenpass/benches/handshake.rs b/rosenpass/benches/handshake.rs index 0399503..bcb9899 100644 --- a/rosenpass/benches/handshake.rs +++ b/rosenpass/benches/handshake.rs @@ -1,5 +1,6 @@ use anyhow::Result; use rosenpass::protocol::{CryptoServer, HandleMsgResult, MsgBuf, PeerPtr, SPk, SSk, SymKey}; +use std::ops::DerefMut; use rosenpass_cipher_traits::Kem; use rosenpass_ciphers::kem::StaticKem; @@ -40,7 +41,7 @@ fn hs(ini: &mut CryptoServer, res: &mut CryptoServer) -> Result<()> { fn keygen() -> Result<(SSk, SPk)> { let (mut sk, mut pk) = (SSk::zero(), SPk::zero()); - StaticKem::keygen(sk.secret_mut(), pk.secret_mut())?; + StaticKem::keygen(sk.secret_mut(), pk.deref_mut())?; Ok((sk, pk)) }