aes-kw: implement KeyInit for Kek

aes-kw/src/lib.rs

@@ -25,7 +25,7 @@ use aes::cipher::{
     array::Array,
     typenum::{Unsigned, U16, U24, U32},
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
-    BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, KeyInit,
+    BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, Key, KeyInit, KeySizeUser,
 };
 
 #[cfg(feature = "alloc")]
@@ -152,12 +152,6 @@ impl<Aes> Kek<Aes>
 where
     Aes: KeyInit + BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt + BlockCipherDecrypt,
 {
-    /// Constructs a new Kek based on the appropriate raw key material.
-    pub fn new(key: &Array<u8, Aes::KeySize>) -> Self {
-        let cipher = Aes::new(key);
-        Kek { cipher }
-    }
-
     /// AES Key Wrap, as defined in RFC 3394.
     ///
     /// The `out` buffer will be overwritten, and must be exactly [`IV_LEN`]
@@ -424,6 +418,27 @@ where
     }
 }
 
+impl<Aes> KeyInit for Kek<Aes>
+where
+    Aes: KeyInit + BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt + BlockCipherDecrypt,
+{
+    fn new(key: &Key<Self>) -> Self {
+        let cipher = Aes::new(key);
+        Kek { cipher }
+    }
+}
+
+impl<Aes> KeySizeUser for Kek<Aes>
+where
+    Aes: KeyInit + BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt + BlockCipherDecrypt,
+{
+    type KeySize = Aes::KeySize;
+
+    fn key_size() -> usize {
+        Aes::key_size()
+    }
+}
+
 struct WCtx<'a> {
     n: usize,
     block: &'a mut Block<Self>,