fixes for belt-dwp + rebase

Author: makavity

.github/workflows/belt-dwp.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - ".github/workflows/belt-dwp.yml"
-      - "aes-gcm/**"
+      - "belt-dwp/**"
       - "Cargo.*"
   push:
     branches: master
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.65.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - armv7a-none-eabi
@@ -44,15 +44,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.72.0 # MSRV
+            rust: 1.85.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.72.0 # MSRV
+            rust: 1.85.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:

Cargo.lock

@@ -5,6 +5,7 @@ members = [
     "aes-gcm-siv",
     "aes-siv",
     "ascon-aead",
+    "belt-dwp",
     "ccm",
     "chacha20poly1305",
     "deoxys",
@@ -28,3 +29,5 @@ ctr = { git = "https://github.com/RustCrypto/block-modes.git" }
 ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" }
 
 pmac = { git = "https://github.com/RustCrypto/MACs.git" }
+
+belt-ctr = { git = "https://github.com/RustCrypto/block-modes.git" }

Cargo.toml

@@ -13,7 +13,7 @@ rust-version = "1.81"
 
 [dependencies]
 aead = { version = "0.6.0-rc.0", default-features = false }
-zeroize = { version = "1.7", default-features = false }
+zeroize = { version = "1.7", default-features = false, optional = true }
 universal-hash = { version = "0.6.0-rc.0" }
 opaque-debug = { version = "0.3" }
 
@@ -24,13 +24,15 @@ belt-ctr = { version = "0.2.0-pre" }
 hex-literal = "0.4"
 
 [features]
-default       = ["alloc", "getrandom"]
-std           = ["aead/std", "alloc"]
-alloc         = ["aead/alloc"]
-arrayvec      = ["aead/arrayvec"]
-getrandom     = ["aead/getrandom", "rand_core"]
-heapless      = ["aead/heapless"]
-rand_core     = ["aead/rand_core"]
+default = ["alloc", "os_rng"]
+alloc = ["aead/alloc"]
+arrayvec = ["aead/arrayvec"]
+bytes = ["aead/bytes"]
+os_rng = ["aead/os_rng", "rand_core"]
+heapless = ["aead/heapless"]
+rand_core = ["aead/rand_core"]
+reduced-round = []
+zeroize = ["dep:zeroize", "belt-ctr/zeroize"]
 
 [package.metadata.docs.rs]
 all-features = true

belt-dwp/Cargo.toml

@@ -44,7 +44,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/belt-dwp/badge.svg
 [docs-link]: https://docs.rs/belt-dwp/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs
 [downloads-image]: https://img.shields.io/crates/d/chacha20poly1305.svg

belt-dwp/README.md

@@ -11,8 +11,8 @@
 //!
 //! Simple usage (allocating, no associated data):
 //!
-#![cfg_attr(all(feature = "getrandom", feature = "std"), doc = "```")]
-#![cfg_attr(not(all(feature = "getrandom", feature = "std")), doc = "```ignore")]
+#![cfg_attr(all(feature = "os_rng", feature = "heapless"), doc = "```")]
+#![cfg_attr(not(all(feature = "os_rng", feature = "heapless")), doc = "```ignore")]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use belt_dwp::{
 //!     aead::{Aead, AeadCore, KeyInit, OsRng},
@@ -44,17 +44,11 @@
 //! which can then be passed as the `buffer` parameter to the in-place encrypt
 //! and decrypt methods:
 //!
-#![cfg_attr(
-    all(feature = "getrandom", feature = "heapless", feature = "std"),
-    doc = "```"
-)]
-#![cfg_attr(
-    not(all(feature = "getrandom", feature = "heapless", feature = "std")),
-    doc = "```ignore"
-)]
+#![cfg_attr(all(feature = "os_rng", feature = "heapless"), doc = "```")]
+#![cfg_attr(not(all(feature = "os_rng", feature = "heapless")), doc = "```ignore")]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use belt_dwp::{
-//!     aead::{AeadInPlace, KeyInit, OsRng, heapless::Vec},
+//!     aead::{AeadInPlaceDetached, KeyInit, OsRng, heapless::Vec},
 //!     BeltDwp, Nonce
 //! };
 //!
@@ -82,9 +76,9 @@
 //! [`aead::Buffer`] for `arrayvec::ArrayVec` (re-exported from the [`aead`] crate as
 //! [`aead::arrayvec::ArrayVec`]).
 
-use aead::consts::{U0, U16, U32, U8};
+use aead::consts::{U16, U32, U8};
+use aead::AeadInPlaceDetached;
 pub use aead::{self, AeadCore, AeadInPlace, Error, Key, KeyInit, KeySizeUser};
-
 use belt_block::cipher::{Block, BlockCipherEncrypt, KeyIvInit, StreamCipher};
 use belt_block::{belt_block_raw, BeltBlock};
 use belt_ctr::BeltCtr;
@@ -118,7 +112,7 @@ impl KeySizeUser for BeltDwp {
     type KeySize = U32;
 }
 
-impl AeadInPlace for BeltDwp {
+impl AeadInPlaceDetached for BeltDwp {
     fn encrypt_in_place_detached(
         &self,
         nonce: &Nonce,
@@ -254,7 +248,6 @@ impl KeyInit for BeltDwp {
 impl AeadCore for BeltDwp {
     type NonceSize = U16;
     type TagSize = U8;
-    type CiphertextOverhead = U0;
 }
 
 /// Get the sizes block for the GHASH

belt-dwp/src/lib.rs

@@ -1,4 +1,4 @@
-use aead::AeadInPlace;
+use aead::AeadInPlaceDetached;
 use belt_dwp::{BeltDwp, KeyInit};
 use hex_literal::hex;