From 6e907ae736de910b4848a0d6a6fdd8f3dfc74294 Mon Sep 17 00:00:00 2001 From: xvzcf Date: Tue, 1 Aug 2023 12:45:05 -0400 Subject: [PATCH] Broke out bytes_to_hex() --- src/jasmin.rs | 13 +++++++++++++ src/jasmin/sha2.rs | 10 +--------- src/jasmin/x25519.rs | 10 +--------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/jasmin.rs b/src/jasmin.rs index 60db4a2d5..3ed236d12 100644 --- a/src/jasmin.rs +++ b/src/jasmin.rs @@ -12,3 +12,16 @@ pub mod x25519; #[cfg(any(target_os = "linux", target_os = "macos"))] pub mod kyber_derand; + +#[cfg(test)] +mod testing { + use std::fmt::Write; + + pub(crate) fn bytes_to_hex(bytes: &[u8]) -> String { + let mut s = String::with_capacity(2 * bytes.len()); + for byte in bytes { + write!(s, "{:02x}", byte).unwrap(); + } + s + } +} diff --git a/src/jasmin/sha2.rs b/src/jasmin/sha2.rs index 06f5b336e..0060d0243 100644 --- a/src/jasmin/sha2.rs +++ b/src/jasmin/sha2.rs @@ -26,15 +26,7 @@ pub fn sha256(input: &[u8]) -> Result { #[cfg(test)] mod tests { use super::*; - use std::fmt::Write; - - fn bytes_to_hex(bytes: &[u8]) -> String { - let mut s = String::with_capacity(2 * bytes.len()); - for byte in bytes { - write!(s, "{:02x}", byte).unwrap(); - } - s - } + use crate::jasmin::testing::bytes_to_hex; #[test] fn test_hash() { diff --git a/src/jasmin/x25519.rs b/src/jasmin/x25519.rs index 7969f7d56..24f3f901e 100644 --- a/src/jasmin/x25519.rs +++ b/src/jasmin/x25519.rs @@ -82,15 +82,7 @@ pub(crate) mod mulx { #[cfg(test)] mod tests { use super::*; - use std::fmt::Write; - - fn bytes_to_hex(bytes: &[u8]) -> String { - let mut s = String::with_capacity(2 * bytes.len()); - for byte in bytes { - write!(s, "{:02x}", byte).unwrap(); - } - s - } + use crate::jasmin::testing::bytes_to_hex; fn bmi2_and_adx_are_supported() -> bool { std::arch::is_x86_feature_detected!("bmi2") && std::arch::is_x86_feature_detected!("adx")