Replace do_final try_into unwrap with direct array output in hash mldsa, adjust mlkem imports

Author: Quant-TheodoreFelix

crypto/mldsa/src/hash_mldsa.rs

@@ -29,14 +29,14 @@
 //! ```rust
 //! use bouncycastle_core::errors::SignatureError;
 //! use bouncycastle_mldsa::{HashMLDSA65_with_SHA512, MLDSATrait, HashMLDSA44_with_SHA512};
-//! use bouncycastle_core::traits::{Signature, PHSignature, Hash};
+//! use bouncycastle_core::traits::{Signature, PHSignature, HashFixedOutput};
 //! use bouncycastle_sha2::SHA512;
 //!
 //! let msg = b"The quick brown fox jumped over the lazy dog";
 //!
 //! // Here, and in contrast to External Mu mode of ML-DSA, we can pre-hash the message before
 //! // even generating the signing key.
-//! let ph: [u8; 64] = SHA512::default().hash(msg).as_slice().try_into().unwrap();
+//! let ph: [u8; 64] = SHA512::default().hash(msg);
 //!
 //!
 //! let (pk, sk) = HashMLDSA65_with_SHA512::keygen().unwrap();
@@ -898,7 +898,9 @@ impl<
     }
 
     fn sign_final_out(self, output: &mut [u8; SIG_LEN]) -> Result<usize, SignatureError> {
-        let ph: [u8; PH_LEN] = self.hash.do_final().try_into().unwrap();
+        let mut ph = [0u8; PH_LEN];
+        let written = self.hash.do_final_out(&mut ph);
+        debug_assert_eq!(written, PH_LEN);
 
         if self.sk.is_none() && self.seed.is_none() {
             return Err(SignatureError::GenericError(
@@ -975,7 +977,9 @@ impl<
             self.pk.is_some(),
             "Somehow you managed to construct a streaming verifier without a public key, impressive!"
         );
-        let ph: [u8; PH_LEN] = self.hash.do_final().try_into().unwrap();
+        let mut ph = [0u8; PH_LEN];
+        let written = self.hash.do_final_out(&mut ph);
+        debug_assert_eq!(written, PH_LEN);
         Self::verify_ph(&self.pk.unwrap(), &ph, Some(&self.ctx[..self.ctx_len]), sig)
     }
 }

crypto/mldsa_lowmemory/src/hash_mldsa.rs

@@ -28,15 +28,15 @@
 //!
 //! ```rust
 //! use bouncycastle_core::errors::SignatureError;
-//! use bouncycastle_core::traits::{Signature, PHSignature, Hash};
+//! use bouncycastle_core::traits::{Signature, PHSignature, HashFixedOutput};
 //! use bouncycastle_sha2::SHA512;
 //! use bouncycastle_mldsa_lowmemory::{MLDSATrait, HashMLDSA65_with_SHA512, HashMLDSA44_with_SHA512};
 //!
 //! let msg = b"The quick brown fox jumped over the lazy dog";
 //!
 //! // Here, and in contrast to External Mu mode of ML-DSA, we can pre-hash the message before
 //! // even generating the signing key.
-//! let ph: [u8; 64] = SHA512::default().hash(msg).as_slice().try_into().unwrap();
+//! let ph: [u8; 64] = SHA512::default().hash(msg);
 //!
 //!
 //! let (pk, sk) = HashMLDSA65_with_SHA512::keygen().unwrap();
@@ -843,7 +843,9 @@ impl<
     }
 
     fn sign_final_out(self, output: &mut [u8; SIG_LEN]) -> Result<usize, SignatureError> {
-        let ph: [u8; PH_LEN] = self.hash.do_final().try_into().unwrap();
+        let mut ph = [0u8; PH_LEN];
+        let written = self.hash.do_final_out(&mut ph);
+        debug_assert_eq!(written, PH_LEN);
 
         if self.sk.is_none() && self.seed.is_none() {
             return Err(SignatureError::GenericError(
@@ -923,7 +925,9 @@ impl<
             self.pk.is_some(),
             "Somehow you managed to construct a streaming verifier without a public key, impressive!"
         );
-        let ph: [u8; PH_LEN] = self.hash.do_final().try_into().unwrap();
+        let mut ph = [0u8; PH_LEN];
+        let written = self.hash.do_final_out(&mut ph);
+        debug_assert_eq!(written, PH_LEN);
         Self::verify_ph(&self.pk.unwrap(), &ph, Some(&self.ctx[..self.ctx_len]), &sig[..SIG_LEN])
     }
 }

crypto/mlkem/src/mlkem_keys.rs

@@ -9,7 +9,7 @@ use crate::mlkem::{MLKEM1024_PK_LEN, MLKEM1024_SK_LEN, MLKEM1024_k};
 use crate::{ML_KEM_512_NAME, ML_KEM_768_NAME, ML_KEM_1024_NAME};
 use bouncycastle_core::errors::KEMError;
 use bouncycastle_core::key_material::{KeyMaterial, KeyMaterialTrait, KeyType};
-use bouncycastle_core::traits::{Hash, KEMPrivateKey, KEMPublicKey, Secret, SecurityStrength};
+use bouncycastle_core::traits::{Hash, HashFixedOutput, KEMPrivateKey, KEMPublicKey, Secret, SecurityStrength};
 use bouncycastle_sha3::SHA3_256;
 
 

crypto/mlkem_lowmemory/src/mlkem_keys.rs

@@ -19,7 +19,7 @@ use crate::polynomial::Polynomial;
 use crate::{ML_KEM_512_NAME, ML_KEM_768_NAME, ML_KEM_1024_NAME};
 use bouncycastle_core::errors::KEMError;
 use bouncycastle_core::key_material::{KeyMaterial, KeyMaterialTrait, KeyType};
-use bouncycastle_core::traits::{Hash, KEMPrivateKey, KEMPublicKey, Secret, SecurityStrength};
+use bouncycastle_core::traits::{Hash, HashFixedOutput, KEMPrivateKey, KEMPublicKey, Secret, SecurityStrength};
 use bouncycastle_sha3::SHA3_256;
 use core::fmt;
 use core::fmt::{Debug, Display, Formatter};