move libcrux_secrets trait implementations to generic_keys module

Author: wysiwys

rsa/src/impl_hacl.rs

@@ -17,11 +17,33 @@ pub mod generic_keys {
         pub(crate) pk: PublicKey<LEN>,
         pub(crate) d: [PrivateKeyByte; LEN],
     }
+    #[cfg(feature = "check-secret-independence")]
+    impl<'a, const LEN: usize> libcrux_secrets::DeclassifyRef
+        for &'a generic_keys::PrivateKey<LEN, libcrux_secrets::U8>
+    {
+        type DeclassifiedRef = &'a generic_keys::PrivateKey<LEN, u8>;
+        fn declassify_ref(self) -> Self::DeclassifiedRef {
+            unsafe { core::mem::transmute(self) }
+        }
+    }
+
     /// An RSA Private Key backed by slices. Use if the length is not known at compile time.
     pub struct VarLenPrivateKey<'a, PrivateKeyByte> {
         pub(crate) pk: VarLenPublicKey<'a>,
         pub(crate) d: &'a [PrivateKeyByte],
     }
+
+    #[cfg(feature = "check-secret-independence")]
+    impl<'a> libcrux_secrets::Declassify for generic_keys::VarLenPrivateKey<'a, libcrux_secrets::U8> {
+        type Declassified = generic_keys::VarLenPrivateKey<'a, u8>;
+        fn declassify(self) -> Self::Declassified {
+            use libcrux_secrets::DeclassifyRef;
+            generic_keys::VarLenPrivateKey {
+                pk: self.pk,
+                d: self.d.declassify_ref(),
+            }
+        }
+    }
 }
 
 /// An RSA Private Key that is `LEN` bytes long.
@@ -134,28 +156,6 @@ fn hacl_hash_alg(alg: crate::DigestAlgorithm) -> libcrux_hacl_rs::streaming_type
     }
 }
 
-#[cfg(feature = "check-secret-independence")]
-impl<'a> libcrux_secrets::Declassify for generic_keys::VarLenPrivateKey<'a, libcrux_secrets::U8> {
-    type Declassified = generic_keys::VarLenPrivateKey<'a, u8>;
-    fn declassify(self) -> Self::Declassified {
-        use libcrux_secrets::DeclassifyRef;
-        generic_keys::VarLenPrivateKey {
-            pk: self.pk,
-            d: self.d.declassify_ref(),
-        }
-    }
-}
-
-#[cfg(feature = "check-secret-independence")]
-impl<'a, const LEN: usize> libcrux_secrets::DeclassifyRef
-    for &'a generic_keys::PrivateKey<LEN, libcrux_secrets::U8>
-{
-    type DeclassifiedRef = &'a generic_keys::PrivateKey<LEN, u8>;
-    fn declassify_ref(self) -> Self::DeclassifiedRef {
-        unsafe { core::mem::transmute(self) }
-    }
-}
-
 // next up: generate these in macros
 
 macro_rules! impl_rsapss_base {