adds acceptable rng trait

supinie · May 21, 2024 · 285746c · 285746c
1 parent 0728df7
commit 285746c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/src/indcpa.rs b/src/indcpa.rs
@@ -38,7 +38,7 @@ impl PrivateKey {
 
     pub fn decrypt(
         &self,
-        ciphertext: &ArrayVec<[u8; 2048]>,
+        ciphertext: &[u8],
     ) -> Result<[u8; SYMBYTES], EncryptionDecryptionError> {
         let sec_level = self.sec_level();
         if ciphertext.len() == sec_level.indcpa_bytes() {

diff --git a/src/kem.rs b/src/kem.rs
@@ -8,7 +8,6 @@ use crate::{
 use rand_chacha::ChaCha20Rng;
 use rand_core::{CryptoRng, RngCore, SeedableRng};
 use sha3::{Digest, Sha3_256};
-use tinyvec::ArrayVec;
 
 pub struct PrivateKey {
     sk: IndcpaPrivateKey,
@@ -46,6 +45,8 @@ fn new_key_from_seed(
     Ok((PublicKey { pk, h_pk }, PrivateKey { sk, pk, h_pk, z }))
 }
 
+pub trait AcceptableRng: RngCore + CryptoRng {}
+
 /// Generates a new keypair for a given security level.
 /// Takes either a given RNG, or will generate one using `ChaCha20`
 /// # Errors
@@ -57,10 +58,11 @@ fn new_key_from_seed(
 /// use enc_rust::kem::generate_key_pair;
 ///
 /// let (pk, sk) = generate_key_pair(None, 3)?;
+///
 /// # Ok::<(), enc_rust::errors::KeyGenerationError>(())
 /// ```
-pub fn generate_key_pair<R: RngCore + CryptoRng>(
-    rng: Option<&mut R>,
+pub fn generate_key_pair(
+    rng: Option<&mut dyn AcceptableRng>,
     k: usize,
 ) -> Result<(PublicKey, PrivateKey), KeyGenerationError> {
     let k_result = K::try_from(k);
@@ -88,7 +90,7 @@ impl PrivateKey {
         self.sk.sec_level()
     }
 
-    pub fn get_public_key(&self) -> PublicKey {
+    pub fn get_public_key(&self) -> PublicKey {    
         PublicKey {
             pk: self.pk,
             h_pk: self.h_pk,
@@ -105,18 +107,20 @@ impl PrivateKey {
     //     let m = self.sk.decrypt(&
 
 }
-// impl PublicKey {
-//     pub fn encapsulate<R: RngCore + CryptoRng>(
-//         &self,
-//         seed: Option<&[u8]>,
-//         shared_secret: Option<[u8; SHAREDSECRETBYTES]>,
-//         rng: Option<&mut R>,
-//     ) -> Result<(CIPHERTEXT, SHAREDSECRET) EncryptionDecryptionError> {
-//         if let Some(seed) = seed {
-//             if seed.len() != SYMBYTES {
-//                 Err(CrystalsError::InvalidSeedLength(seed.len(), SYMBYTES).into())
-//             }
-
-//         Ok(())
-//     }
-// }
+
+#[cfg(target_os = "none")]
+impl PublicKey {
+    pub fn encapsulate<R: RngCore + CryptoRng>(
+        &self,
+        seed: Option<&[u8]>,
+        shared_secret: Option<[u8; SHAREDSECRETBYTES]>,
+        rng: Option<&mut R>,
+    ) -> Result<(CIPHERTEXT, SHAREDSECRET), EncryptionDecryptionError> {
+        if let Some(seed) = seed {
+            if seed.len() != SYMBYTES {
+                Err(CrystalsError::InvalidSeedLength(seed.len(), SYMBYTES).into())
+            }
+            Ok(())
+        }
+    }
+}
diff --git a/src/polynomials.rs b/src/polynomials.rs
@@ -283,7 +283,7 @@ impl Poly<Normalised> {
                     })
             })
             .collect::<Result<ArrayVec<[u8; SYMBYTES]>, TryFromIntError>>()
-            .map(tinyvec::ArrayVec::into_inner);
+            .map(ArrayVec::into_inner);
 
         buf
     }