use merged Aead trait

Author: baloo

Cargo.lock

@@ -18,8 +18,8 @@ resolver = "2"
 aead-stream = { path = "./aead-stream" }
 aes-gcm     = { path = "./aes-gcm" }
 
-aead          = { git = "https://github.com/baloo/traits.git", branch = "baloo/aead/bicephalbuffer" }
-crypto-common = { git = "https://github.com/baloo/traits.git", branch = "baloo/aead/bicephalbuffer" }
+aead          = { git = "https://github.com/baloo/traits.git", branch = "baloo/aead/mockbuffer-merge" }
+crypto-common = { git = "https://github.com/baloo/traits.git", branch = "baloo/aead/mockbuffer-merge" }
 
 chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
 

Cargo.toml

@@ -6,7 +6,7 @@
 extern crate alloc;
 
 use aead::{
-    AeadCore, AeadInPlace, Buffer, Error, Result,
+    Aead, Buffer, Error, Result,
     array::{
         Array, ArraySize,
         typenum::{U4, U5, Unsigned},
@@ -27,12 +27,12 @@ pub type Nonce<A, S> = Array<u8, NonceSize<A, S>>;
 /// Size of a nonce as used by a STREAM construction, sans the overhead of
 /// the STREAM protocol itself.
 pub type NonceSize<A, S> =
-    <<A as AeadCore>::NonceSize as Sub<<S as StreamPrimitive<A>>::NonceOverhead>>::Output;
+    <<A as Aead>::NonceSize as Sub<<S as StreamPrimitive<A>>::NonceOverhead>>::Output;
 
 /// Create a new STREAM from the provided AEAD.
 pub trait NewStream<A>: StreamPrimitive<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<Self::NonceOverhead>,
     NonceSize<A, Self>: ArraySize,
 {
@@ -57,7 +57,7 @@ where
 /// Deliberately immutable and stateless to permit parallel operation.
 pub trait StreamPrimitive<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<Self::NonceOverhead>,
     NonceSize<A, Self>: ArraySize,
 {
@@ -165,7 +165,7 @@ macro_rules! impl_stream_object {
         #[derive(Debug)]
         pub struct $name<A, S>
         where
-            A: AeadInPlace,
+            A: Aead,
             S: StreamPrimitive<A>,
             A::NonceSize: Sub<<S as StreamPrimitive<A>>::NonceOverhead>,
             NonceSize<A, S>: ArraySize,
@@ -179,7 +179,7 @@ macro_rules! impl_stream_object {
 
         impl<A, S> $name<A, S>
         where
-            A: AeadInPlace,
+            A: Aead,
             S: StreamPrimitive<A>,
             A::NonceSize: Sub<<S as StreamPrimitive<A>>::NonceOverhead>,
             NonceSize<A, S>: ArraySize,
@@ -344,9 +344,9 @@ pub type DecryptorLE31<A> = Decryptor<A, StreamLE31<A>>;
 #[derive(Debug)]
 pub struct StreamBE32<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U5>,
-    <<A as AeadCore>::NonceSize as Sub<U5>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U5>>::Output: ArraySize,
 {
     /// Underlying AEAD cipher
     aead: A,
@@ -357,9 +357,9 @@ where
 
 impl<A> NewStream<A> for StreamBE32<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U5>,
-    <<A as AeadCore>::NonceSize as Sub<U5>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U5>>::Output: ArraySize,
 {
     fn from_aead(aead: A, nonce: &Nonce<A, Self>) -> Self {
         Self {
@@ -371,9 +371,9 @@ where
 
 impl<A> StreamPrimitive<A> for StreamBE32<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U5>,
-    <<A as AeadCore>::NonceSize as Sub<U5>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U5>>::Output: ArraySize,
 {
     type NonceOverhead = U5;
     type Counter = u32;
@@ -405,9 +405,9 @@ where
 
 impl<A> StreamBE32<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U5>,
-    <<A as AeadCore>::NonceSize as Sub<U5>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U5>>::Output: ArraySize,
 {
     /// Compute the full AEAD nonce including the STREAM counter and last
     /// block flag.
@@ -434,9 +434,9 @@ where
 #[derive(Debug)]
 pub struct StreamLE31<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U4>,
-    <<A as AeadCore>::NonceSize as Sub<U4>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U4>>::Output: ArraySize,
 {
     /// Underlying AEAD cipher
     aead: A,
@@ -447,9 +447,9 @@ where
 
 impl<A> NewStream<A> for StreamLE31<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U4>,
-    <<A as AeadCore>::NonceSize as Sub<U4>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U4>>::Output: ArraySize,
 {
     fn from_aead(aead: A, nonce: &Nonce<A, Self>) -> Self {
         Self {
@@ -461,9 +461,9 @@ where
 
 impl<A> StreamPrimitive<A> for StreamLE31<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U4>,
-    <<A as AeadCore>::NonceSize as Sub<U4>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U4>>::Output: ArraySize,
 {
     type NonceOverhead = U4;
     type Counter = u32;
@@ -495,9 +495,9 @@ where
 
 impl<A> StreamLE31<A>
 where
-    A: AeadInPlace,
+    A: Aead,
     A::NonceSize: Sub<U4>,
-    <<A as AeadCore>::NonceSize as Sub<U4>>::Output: ArraySize,
+    <<A as Aead>::NonceSize as Sub<U4>>::Output: ArraySize,
 {
     /// Compute the full AEAD nonce including the STREAM counter and last
     /// block flag.

aead-stream/src/lib.rs

@@ -17,7 +17,7 @@ categories = ["cryptography", "no-std"]
 rust-version = "1.85"
 
 [dependencies]
-aead = { version = "0.6.0-rc.0", default-features = false, features = ["inout"] }
+aead = { version = "0.6.0-rc.0", default-features = false }
 aes = { version = "=0.9.0-pre.3", optional = true }
 cipher = "=0.5.0-pre.8"
 ctr = "0.10.0-pre.2"

aes-gcm-siv/Cargo.toml

@@ -15,7 +15,7 @@
 #![cfg_attr(not(feature = "os_rng"), doc = "```ignore")]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use aes_gcm_siv::{
-//!     aead::{Aead, AeadCore, KeyInit, rand_core::OsRng},
+//!     aead::{Aead, KeyInit, rand_core::OsRng},
 //!     Aes256GcmSiv, Nonce // Or `Aes128GcmSiv`
 //! };
 //!
@@ -48,7 +48,7 @@
 #![cfg_attr(not(all(feature = "os_rng", feature = "heapless")), doc = "```ignore")]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use aes_gcm_siv::{
-//!     aead::{AeadInPlace, KeyInit, rand_core::OsRng, heapless::Vec},
+//!     aead::{Aead, KeyInit, rand_core::OsRng, heapless::Vec},
 //!     Aes256GcmSiv, Nonce, // Or `Aes128GcmSiv`
 //! };
 //!
@@ -78,12 +78,12 @@
 //! provide an impl of [`aead::Buffer`] for `bytes::BytesMut` (re-exported from the
 //! [`aead`] crate as [`aead::bytes::BytesMut`]).
 
-pub use aead::{self, AeadCore, AeadInOut, Error, Key, KeyInit, KeySizeUser};
+pub use aead::{self, Aead, Error, Key, KeyInit, KeySizeUser};
 
 #[cfg(feature = "aes")]
 pub use aes;
 
-use aead::{PostfixTagged, inout::InOutBuf};
+use aead::{TagPosition, inout::InOutBuf};
 use cipher::{
     BlockCipherEncrypt, BlockSizeUser, InnerIvInit, StreamCipherCore,
     array::Array,
@@ -155,20 +155,14 @@ where
     }
 }
 
-impl<Aes> AeadCore for AesGcmSiv<Aes>
+impl<Aes> Aead for AesGcmSiv<Aes>
 where
     Aes: BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt + KeyInit,
 {
     type NonceSize = U12;
     type TagSize = U16;
-}
-
-impl<Aes> PostfixTagged for AesGcmSiv<Aes> {}
+    const TAG_POSITION: TagPosition = TagPosition::Postfix;
 
-impl<Aes> AeadInOut for AesGcmSiv<Aes>
-where
-    Aes: BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt + KeyInit,
-{
     fn encrypt_inout_detached(
         &self,
         nonce: &Nonce,

aes-gcm-siv/src/lib.rs

@@ -17,7 +17,7 @@ categories = ["cryptography", "no-std"]
 rust-version = "1.85"
 
 [dependencies]
-aead = { version = "0.6.0-rc.0", default-features = false, features = ["inout"] }
+aead = { version = "0.6.0-rc.0", default-features = false }
 aes = { version = "=0.9.0-pre.3", optional = true }
 cipher = "=0.5.0-pre.8"
 ctr = "0.10.0-pre.2"

aes-gcm/Cargo.toml

@@ -15,7 +15,7 @@
 #![cfg_attr(all(feature = "os_rng", feature = "heapless"), doc = "```")]
 #![cfg_attr(not(all(feature = "os_rng", feature = "heapless")), doc = "```ignore")]
 //! use aes_gcm::{
-//!     aead::{Aead, AeadCore, KeyInit, rand_core::OsRng},
+//!     aead::{Aead, KeyInit, rand_core::OsRng},
 //!     Aes256Gcm, Nonce, Key // Or `Aes128Gcm`
 //! };
 //!
@@ -68,7 +68,7 @@
 #![cfg_attr(not(all(feature = "os_rng", feature = "heapless")), doc = "```ignore")]
 //! # fn main() -> Result<(), Box<dyn core::error::Error>> {
 //! use aes_gcm::{
-//!     aead::{AeadCore, AeadInPlace, KeyInit, rand_core::OsRng, heapless::Vec},
+//!     aead::{Aead, KeyInit, rand_core::OsRng, heapless::Vec},
 //!     Aes256Gcm, Nonce, // Or `Aes128Gcm`
 //! };
 //!
@@ -98,12 +98,12 @@
 //! provide an impl of [`aead::Buffer`] for `bytes::BytesMut` (re-exported from the
 //! [`aead`] crate as [`aead::bytes::BytesMut`]).
 
-pub use aead::{self, AeadCore, AeadInOut, Error, Key, KeyInit, KeySizeUser};
+pub use aead::{self, Aead, Error, Key, KeyInit, KeySizeUser};
 
 #[cfg(feature = "aes")]
 pub use aes;
 
-use aead::{PostfixTagged, inout::InOutBuf};
+use aead::{TagPosition, inout::InOutBuf};
 
 use cipher::{
     BlockCipherEncrypt, BlockSizeUser, InnerIvInit, StreamCipherCore,
@@ -246,26 +246,16 @@ where
     }
 }
 
-impl<Aes, NonceSize, TagSize> AeadCore for AesGcm<Aes, NonceSize, TagSize>
+impl<Aes, NonceSize, TagSize> Aead for AesGcm<Aes, NonceSize, TagSize>
 where
+    Aes: BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt,
     NonceSize: ArraySize,
     TagSize: self::TagSize,
 {
     type NonceSize = NonceSize;
     type TagSize = TagSize;
-}
-
-impl<Aes, NonceSize, TagSize> PostfixTagged for AesGcm<Aes, NonceSize, TagSize> where
-    TagSize: self::TagSize
-{
-}
+    const TAG_POSITION: TagPosition = TagPosition::Postfix;
 
-impl<Aes, NonceSize, TagSize> AeadInOut for AesGcm<Aes, NonceSize, TagSize>
-where
-    Aes: BlockSizeUser<BlockSize = U16> + BlockCipherEncrypt,
-    NonceSize: ArraySize,
-    TagSize: self::TagSize,
-{
     fn encrypt_inout_detached(
         &self,
         nonce: &Nonce<NonceSize>,

aes-gcm/src/lib.rs

@@ -7,7 +7,7 @@ mod common;
 
 use self::common::TestVector;
 use aes_gcm::Aes128Gcm;
-use aes_gcm::aead::{Aead, AeadInOut, KeyInit, Payload, array::Array};
+use aes_gcm::aead::{Aead, KeyInit, Payload, array::Array};
 use hex_literal::hex;
 
 /// NIST CAVS vectors

aes-gcm/tests/aes128gcm.rs

@@ -7,7 +7,7 @@ mod common;
 
 use self::common::TestVector;
 use aes_gcm::Aes256Gcm;
-use aes_gcm::aead::{Aead, AeadInOut, KeyInit, Payload, array::Array};
+use aes_gcm::aead::{Aead, KeyInit, Payload, array::Array};
 use hex_literal::hex;
 
 /// NIST CAVS vectors