Update crypto-mac to v0.9 (#57)

RustCrypto · Aug 12, 2020 · d2e6f95 · d2e6f95
1 parent b34d711
commit d2e6f95
Show file tree

Hide file tree

Showing 24 changed files with 135 additions and 158 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmac/CHANGELOG.md b/cmac/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.4.0 (2020-08-12)
+### Changed
+- Bump `crypto-mac` dependency to v0.9, implement the `FromBlockCipher` trait ([#57])
+
+[#57]: https://github.com/RustCrypto/MACs/pull/57
+
 ## 0.3.0 (2020-06-06)
 ### Changed
 - Bump `aes` crate dependency to v0.4 ([#40])

diff --git a/cmac/Cargo.toml b/cmac/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cmac"
-version = "0.3.1"
+version = "0.4.0"
 description = "Generic implementation of Cipher-based Message Authentication Code"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -12,16 +12,15 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-crypto-mac = "0.8"
-block-cipher = "0.7"
+crypto-mac = { version = "0.9.1", features = ["block-cipher"] }
 dbl = "0.3"
 
 [dev-dependencies]
 hex-literal = "0.2"
-crypto-mac = { version = "0.8", features = ["dev"] }
-aes = "0.4"
-kuznyechik = "0.4"
-magma = "0.4"
+crypto-mac = { version = "0.9.1", features = ["dev"] }
+aes = "0.5"
+kuznyechik = "0.5"
+magma = "0.5"
 
 [features]
 std = ["crypto-mac/std"]
diff --git a/cmac/src/lib.rs b/cmac/src/lib.rs
@@ -50,15 +50,15 @@
 #[cfg(feature = "std")]
 extern crate std;
 
-pub use crypto_mac::{self, Mac, NewMac};
-
-use block_cipher::generic_array::typenum::Unsigned;
-use block_cipher::generic_array::{ArrayLength, GenericArray};
-use block_cipher::{BlockCipher, NewBlockCipher};
-use crypto_mac::{InvalidKeyLength, Output};
-use dbl::Dbl;
+pub use crypto_mac::{self, FromBlockCipher, Mac, NewMac};
 
 use core::fmt;
+use crypto_mac::{
+    block_cipher::BlockCipher,
+    generic_array::{typenum::Unsigned, ArrayLength, GenericArray},
+    Output,
+};
+use dbl::Dbl;
 
 type Block<N> = GenericArray<u8, N>;
 
@@ -76,12 +76,14 @@ where
     pos: usize,
 }
 
-impl<C: BlockCipher> From<C> for Cmac<C>
+impl<C> FromBlockCipher for Cmac<C>
 where
     C: BlockCipher + Clone,
     Block<C::BlockSize>: Dbl,
 {
-    fn from(cipher: C) -> Self {
+    type Cipher = C;
+
+    fn from_cipher(cipher: C) -> Self {
         let mut subkey = GenericArray::default();
         cipher.encrypt_block(&mut subkey);
 
@@ -98,23 +100,6 @@ where
     }
 }
 
-impl<C> NewMac for Cmac<C>
-where
-    C: BlockCipher + NewBlockCipher + Clone,
-    Block<C::BlockSize>: Dbl,
-{
-    type KeySize = C::KeySize;
-
-    fn new(key: &GenericArray<u8, Self::KeySize>) -> Self {
-        Self::from(C::new(key))
-    }
-
-    fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
-        let cipher = C::new_varkey(key).map_err(|_| InvalidKeyLength)?;
-        Ok(Self::from(cipher))
-    }
-}
-
 impl<C> Mac for Cmac<C>
 where
     C: BlockCipher + Clone,

diff --git a/cmac/tests/data/aes128.blb b/cmac/tests/data/aes128.blb
diff --git a/cmac/tests/data/aes192.blb b/cmac/tests/data/aes192.blb
diff --git a/cmac/tests/data/aes256.blb b/cmac/tests/data/aes256.blb
diff --git a/daa/CHANGELOG.md b/daa/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.3.0 (2020-08-12)
+### Changed
+- Bump `crypto-mac` dependency to v0.9, implement the `FromBlockCipher` trait ([#57])
+
+[#57]: https://github.com/RustCrypto/MACs/pull/57
+
 ## 0.2.0 (2020-06-08)
 ### Changed
 - Bump `daa` crate to v0.4 release ([#43])