Merge branch 'main' into add-qm31

Author: FrancoGiachetta

crates/starknet-types-core/Cargo.toml

@@ -21,24 +21,27 @@ arbitrary = { version = "1.3", optional = true }
 blake2 = { version = "0.10.6", default-features = false, optional = true }
 digest = { version = "0.10.7", optional = true }
 serde = { version = "1", optional = true, default-features = false, features = [
-  "alloc", "derive"
+    "alloc", "derive"
 ] }
 lambdaworks-crypto = { version = "0.10.0", default-features = false, optional = true }
 parity-scale-codec = { version = "3.6", default-features = false, optional = true }
 lazy_static = { version = "1.5", default-features = false, optional = true }
 zeroize = { version = "1.8.1", default-features = false, optional = true }
+subtle = { version = "2.6.1", default-features = false, optional = true }
+rand = { version = "0.9.2", default-features = false, optional = true }
 
 [features]
 default = ["std", "serde", "curve", "num-traits"]
 std = [
-  "alloc",
-  "lambdaworks-math/std",
-  "num-traits/std",
-  "num-bigint/std",
-  "num-integer/std",
-  "serde?/std",
-  "lambdaworks-crypto?/std",
-  "zeroize?/std",
+    "alloc",
+    "lambdaworks-math/std",
+    "num-traits/std",
+    "num-bigint/std",
+    "num-integer/std",
+    "serde?/std",
+    "lambdaworks-crypto?/std",
+    "zeroize?/std",
+    "rand?/std"
 ]
 alloc = ["zeroize?/alloc"]
 curve = []
@@ -49,18 +52,18 @@ serde = ["alloc", "dep:serde"]
 prime-bigint = ["dep:lazy_static"]
 num-traits = []
 papyrus-serialization = ["std"]
-zeroize = ["dep:zeroize"]
+secret-felt = ["alloc", "dep:zeroize", "dep:subtle", "subtle/const-generics", "subtle/core_hint_black_box", "dep:rand", "rand/alloc"]
 
 [dev-dependencies]
 proptest = { version = "1.5", default-features = false, features = [
-  "alloc",
-  "proptest-macro",
+    "alloc",
+    "proptest-macro",
 ] }
 regex = "1.11"
 serde_test = "1"
 criterion = "0.5"
-rand_chacha = "0.3"
-rand = "0.8"
+rand_chacha = "0.9"
+rand = "0.9.2"
 rstest = "0.24"
 lazy_static = { version = "1.5", default-features = false }
 

crates/starknet-types-core/src/felt/mod.rs

@@ -1,4 +1,6 @@
 #[cfg(feature = "alloc")]
+pub extern crate alloc;
+#[cfg(feature = "alloc")]
 mod alloc_impls;
 #[cfg(feature = "arbitrary")]
 mod arbitrary;
@@ -14,10 +16,10 @@ mod parity_scale_codec;
 #[cfg(feature = "prime-bigint")]
 mod prime_bigint;
 mod primitive_conversions;
+#[cfg(feature = "secret-felt")]
+pub mod secret_felt;
 #[cfg(feature = "serde")]
 mod serde;
-#[cfg(feature = "zeroize")]
-mod zeroize;
 
 use lambdaworks_math::errors::CreationError;
 pub use non_zero::{FeltIsZeroError, NonZeroFelt};
@@ -33,9 +35,6 @@ use num_integer::Integer;
 use num_traits::{One, Zero};
 pub use primitive_conversions::PrimitiveFromFeltError;
 
-#[cfg(feature = "alloc")]
-pub extern crate alloc;
-
 use lambdaworks_math::{
     field::{
         element::FieldElement, fields::fft_friendly::stark_252_prime_field::Stark252PrimeField,
@@ -742,7 +741,6 @@ mod arithmetic {
 }
 
 mod formatting {
-
     use core::fmt;
 
     use super::*;

crates/starknet-types-core/src/felt/secret_felt.rs

@@ -0,0 +1,286 @@
+use crate::felt::{Felt, FromStrError};
+use rand::{CryptoRng, RngCore};
+use subtle::ConstantTimeEq;
+use zeroize::{Zeroize, Zeroizing};
+
+#[cfg(not(feature = "std"))]
+use super::alloc::{boxed::Box, string::String, vec::Vec};
+
+/// A wrapper for a [Felt] that ensures the value is securely zeroized when dropped.
+///
+/// This type provides secure handling of sensitive [Felt] values (like private keys)
+/// by ensuring that the memory is properly cleared when the value is no longer needed.
+#[derive(Eq)]
+pub struct SecretFelt(Box<Felt>);
+
+impl zeroize::DefaultIsZeroes for Felt {}
+
+impl Zeroize for SecretFelt {
+    fn zeroize(&mut self) {
+        self.0.zeroize();
+    }
+}
+
+impl Drop for SecretFelt {
+    fn drop(&mut self) {
+        self.zeroize();
+    }
+}
+
+impl SecretFelt {
+    /// Creates a new [SecretFelt] from a [Felt] value and zeroize the original.
+    ///
+    /// It takes a mutable reference to a [Felt] value, creates a copy,
+    /// and then zeroize the original value to ensure it doesn't remain in memory.
+    ///
+    /// # Warning
+    ///
+    /// Avoid moving the secret [Felt] in memory and avoid intermediate
+    /// operations between the [Felt] creation and the [SecretFelt] initialization
+    /// in order to not leave any copies of the value in memory
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use starknet_types_core::felt::{Felt, secret_felt::SecretFelt};
+    ///
+    /// let mut private_key = Felt::from_hex_unchecked("0x2d39148a92f479fb077389d");
+    /// let secret_felt = SecretFelt::from_felt(&mut private_key);
+    /// // private_key is now zeroized (set to Felt::ZERO)
+    /// ```
+    pub fn from_felt(secret_felt: &mut Felt) -> Self {
+        let boxed_copy = Box::new(*secret_felt);
+        secret_felt.zeroize();
+        Self(boxed_copy)
+    }
+
+    /// Creates a new [SecretFelt] from a hex String and zeroized the original String.
+    ///
+    ///
+    /// # Warning
+    /// Make sure the String is initialized in a secure way.
+    /// e.g. read from a file.
+    ///
+    /// # Example
+    /// ```
+    /// use std::fs;
+    /// use starknet_types_core::felt::secret_felt::SecretFelt;
+    /// use std::str::FromStr;
+    ///
+    /// let mut private_key = String::from_str("0x2d39148a92f479fb077389d").unwrap();
+    /// let secret_felt = SecretFelt::from_hex_string(&mut private_key).unwrap();
+    /// ```
+    pub fn from_hex_string(hex: &mut String) -> Result<Self, FromStrError> {
+        let secret_felt = Felt::from_hex(hex)?;
+        hex.zeroize();
+        Ok(Self(Box::new(secret_felt)))
+    }
+
+    /// Creates a new [SecretFelt] from its big-endian representation in a Vec<u8> of length 32.
+    /// Internally it uses [from_bytes_be](Felt::from_bytes_be).
+    /// The input will be zeroized after calling this function
+    pub fn from_bytes_be(secret: &mut [u8; 32]) -> Self {
+        let secret_felt = Self(Box::new(Felt::from_bytes_be(secret)));
+        secret.zeroize();
+        secret_felt
+    }
+
+    /// Creates a new [SecretFelt] from its little-endian representation in a Vec<u8> of length 32.
+    /// Internally it uses [from_bytes_le](Felt::from_bytes_le).
+    /// The input will be zeroized after calling this function
+    pub fn from_bytes_le(secret: &mut [u8; 32]) -> Self {
+        let secret_felt = Self(Box::new(Felt::from_bytes_le(secret)));
+        secret.zeroize();
+        secret_felt
+    }
+
+    /// Create a new [SecretFelt] from cryptographically secure PRNG
+    ///
+    /// # Example
+    /// ```
+    /// use starknet_types_core::felt::secret_felt::SecretFelt;
+    /// use rand_chacha::ChaCha20Rng;
+    /// use rand::SeedableRng;
+    ///
+    /// let rng = ChaCha20Rng::from_os_rng();
+    /// let secret_key = SecretFelt::from_random(rng);
+    /// ```
+    pub fn from_random<T>(mut rng: T) -> Self
+    where
+        T: RngCore + CryptoRng,
+    {
+        let mut buffer = [0u8; 32];
+        rng.fill_bytes(&mut buffer);
+
+        let secret_felt = Self(Box::new(Felt::from_bytes_be(&buffer)));
+        buffer.zeroize();
+
+        secret_felt
+    }
+
+    /// Returns a safe copy of the inner value.
+    ///
+    /// # Warning
+    ///
+    /// Be careful not to copy the value elsewhere, as that would defeat
+    /// the security guarantees of this type.
+    pub fn inner_value(&self) -> Zeroizing<Felt> {
+        Zeroizing::new(*self.0.clone())
+    }
+}
+
+/// Constant time equality check for [SecretFelt]
+impl PartialEq for SecretFelt {
+    fn eq(&self, other: &Self) -> bool {
+        let mut self_limbs = self.0 .0.representative().limbs;
+        let mut other_limbs = other.0 .0.representative().limbs;
+
+        let is_eq: bool = self_limbs.ct_eq(&other_limbs).into();
+
+        self_limbs.zeroize();
+        other_limbs.zeroize();
+
+        is_eq
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::felt::{secret_felt::SecretFelt, Felt};
+    use core::mem::size_of;
+    use rand_chacha::{rand_core::SeedableRng, ChaCha20Rng};
+    use std::{ops::Deref, str::FromStr};
+    use zeroize::Zeroize;
+
+    #[test]
+    fn test_zeroize_secret_felt() {
+        let mut signing_key = SecretFelt::from_random(ChaCha20Rng::seed_from_u64(1));
+        signing_key.zeroize();
+
+        // Get a pointer to the inner Felt
+        let ptr = signing_key.inner_value().deref() as *const Felt as *const u8;
+        let after_zeroize = unsafe { std::slice::from_raw_parts(ptr, size_of::<Felt>()) };
+
+        // Check that the memory is zeroed
+        assert_eq!(
+            Felt::from_bytes_be_slice(after_zeroize),
+            Felt::ZERO,
+            "Memory was not properly zeroized"
+        );
+    }
+
+    #[test]
+    fn test_zeroize_original() {
+        let mut private_key = Felt::from_hex_unchecked(
+            "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+        );
+        let mut signing_key = SecretFelt::from_felt(&mut private_key);
+        signing_key.zeroize();
+
+        // Get a pointer to the original memory
+        let ptr = private_key.as_ref() as *const Felt as *const u8;
+        let after_zeroize = unsafe { std::slice::from_raw_parts(ptr, size_of::<Felt>()) };
+
+        // Check that original value was zeroized
+        assert_eq!(
+            Felt::from_bytes_be_slice(after_zeroize),
+            Felt::ZERO,
+            "Original value was not properly zeroized"
+        );
+    }
+
+    #[test]
+    fn test_zeroize_hex_string() {
+        let mut private_key =
+            String::from_str("0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF")
+                .unwrap();
+
+        let mut signing_key = SecretFelt::from_hex_string(&mut private_key).unwrap();
+        signing_key.zeroize();
+
+        let ptr = private_key.as_ptr() as *const Felt as *const u8;
+        let after_zeroize = unsafe { std::slice::from_raw_parts(ptr, size_of::<Felt>()) };
+
+        assert_eq!(
+            Felt::from_bytes_be_slice(after_zeroize),
+            Felt::ZERO,
+            "Original value was not properly zeroized"
+        );
+    }
+
+    #[test]
+    fn test_zeroize_on_drop() {
+        let mut private_key = Felt::from_hex_unchecked(
+            "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+        );
+
+        // make a copy, the initial Felt will be zeroized
+        let pk_copy = private_key;
+
+        let raw_ptr;
+        {
+            let signing_key = SecretFelt::from_felt(&mut private_key);
+
+            let inner_value = *signing_key.0;
+            raw_ptr = &inner_value as *const Felt as *const u8;
+
+            // Verify it's not zero before dropping
+            let before_drop = unsafe { std::slice::from_raw_parts(raw_ptr, size_of::<Felt>()) };
+            assert!(
+                !before_drop.iter().all(|&b| b == 0),
+                "Memory should not be zeroed yet"
+            );
+        } // At this point, signing_key has been dropped and zeroized
+
+        // Check that the memory is zeroed after drop
+        let after_drop = unsafe { std::slice::from_raw_parts(raw_ptr, size_of::<Felt>()) };
+
+        let felt_after_drop = Felt::from_bytes_be_slice(after_drop);
+
+        // Memory is not zero because the compiler reuse that memory slot
+        // but should not be equal to the initial value
+        assert_ne!(pk_copy, felt_after_drop);
+    }
+
+    #[test]
+    fn test_inner_value() {
+        let mut private_key = Felt::from_hex_unchecked(
+            "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+        );
+
+        // make a copy, the initial Felt will be zeroized
+        let pk_copy = private_key;
+
+        let raw_ptr;
+        {
+            let signing_key = SecretFelt::from_felt(&mut private_key);
+
+            let inner_felt = signing_key.inner_value();
+
+            assert_eq!(*inner_felt, pk_copy);
+
+            raw_ptr = inner_felt.as_ref() as *const Felt as *const u8;
+        } // inner_value should be zeroized when is out of scope
+
+        let after_drop = unsafe { std::slice::from_raw_parts(raw_ptr, size_of::<Felt>()) };
+        let felt_after_drop = Felt::from_bytes_be_slice(after_drop);
+
+        // Memory is not zero because the compiler reuse that memory slot
+        // but should not be equal to the initial value
+        assert_ne!(pk_copy, felt_after_drop);
+    }
+
+    #[test]
+    fn test_partial_eq() {
+        let mut private_key1 = [255u8; 32];
+        let mut private_key2 = [255u8; 32];
+        let mut private_key3 = [254u8; 32];
+
+        let signing_key1 = SecretFelt::from_bytes_be(&mut private_key1);
+        let signing_key2 = SecretFelt::from_bytes_be(&mut private_key2);
+        let signing_key3 = SecretFelt::from_bytes_be(&mut private_key3);
+
+        assert!(signing_key1.eq(&signing_key2));
+        assert!(signing_key1.ne(&signing_key3));
+    }
+}