Bump aead to v0.6.0-rc.3; restore getrandom features

This release drops the dependency on `rand_core` when using `getrandom`,
which was the original feature name for this functionality, and in doing
so also avoids a breaking change.

It also updates `rand_core` to the v0.10 prereleases.

Dependencies which depend on `rand_core` v0.10 prereleases have also
been bumped to ensure we don't pull in old versions.

Author: tarcieri

Cargo.lock

@@ -18,7 +18,3 @@ members = [
 [patch.crates-io]
 aead-stream = { path = "aead-stream" }
 aes-gcm = { path = "aes-gcm" }
-
-# https://github.com/RustCrypto/traits/pull/2019
-aead = { git = "https://github.com/RustCrypto/traits.git" }
-crypto-common = { git = "https://github.com/RustCrypto/traits.git" }

Cargo.toml

@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 rust-version = "1.85"
 
 [dependencies]
-aead = { version = "0.6.0-rc.2", default-features = false }
+aead = { version = "0.6.0-rc.3", default-features = false }
 
 [features]
 alloc = ["aead/alloc"]

aead-stream/Cargo.toml

@@ -17,23 +17,23 @@ categories = ["cryptography", "no-std"]
 rust-version = "1.85"
 
 [dependencies]
-aead = { version = "0.6.0-rc.2", default-features = false }
-aes = { version = "0.9.0-rc.1", optional = true }
-cipher = "0.5.0-rc.1"
-ctr = "0.10.0-rc.1"
-polyval = { version = "0.7.0-rc.2", default-features = false }
+aead = { version = "0.6.0-rc.3", default-features = false }
+aes = { version = "0.9.0-rc.2", optional = true }
+cipher = "0.5.0-rc.2"
+ctr = "0.10.0-rc.2"
+polyval = { version = "0.7.0-rc.3", default-features = false }
 subtle = { version = "2", default-features = false }
 zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]
-aead = { version = "0.6.0-rc.2", features = ["dev"], default-features = false }
+aead = { version = "0.6.0-rc.3", features = ["dev"], default-features = false }
 
 [features]
-default = ["aes", "alloc", "os_rng"]
+default = ["aes", "alloc", "getrandom"]
 alloc = ["aead/alloc"]
 arrayvec = ["aead/arrayvec"]
 bytes = ["aead/bytes"]
-os_rng = ["aead/os_rng", "rand_core"]
+getrandom = ["aead/getrandom"]
 rand_core = ["aead/rand_core"]
 
 [package.metadata.docs.rs]

aes-gcm-siv/Cargo.toml

@@ -11,8 +11,8 @@
 //!
 //! Simple usage (allocating, no associated data):
 //!
-#![cfg_attr(feature = "os_rng", doc = "```")]
-#![cfg_attr(not(feature = "os_rng"), doc = "```ignore")]
+#![cfg_attr(feature = "getrandom", doc = "```")]
+#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use aes_gcm_siv::{
 //!     aead::{Aead, AeadCore, KeyInit, rand_core::OsRng},
@@ -47,8 +47,11 @@
 //! It can then be passed as the `buffer` parameter to the in-place encrypt
 //! and decrypt methods:
 //!
-#![cfg_attr(all(feature = "os_rng", feature = "arrayvec"), doc = "```")]
-#![cfg_attr(not(all(feature = "os_rng", feature = "arrayvec")), doc = "```ignore")]
+#![cfg_attr(all(feature = "getrandom", feature = "arrayvec"), doc = "```")]
+#![cfg_attr(
+    not(all(feature = "getrandom", feature = "arrayvec")),
+    doc = "```ignore"
+)]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use aes_gcm_siv::{
 //!     aead::{AeadInOut, Buffer, KeyInit, rand_core::OsRng, arrayvec::ArrayVec},

aes-gcm-siv/src/lib.rs

@@ -17,24 +17,27 @@ categories = ["cryptography", "no-std"]
 rust-version = "1.85"
 
 [dependencies]
-aead = { version = "0.6.0-rc.2", default-features = false }
-aes = { version = "0.9.0-rc.1", optional = true }
-cipher = "0.5.0-rc.1"
-ctr = "0.10.0-rc.1"
-ghash = { version = "0.6.0-rc.2", default-features = false }
+aead = { version = "0.6.0-rc.3", default-features = false }
+cipher = "0.5.0-rc.2"
+ctr = "0.10.0-rc.2"
+ghash = { version = "0.6.0-rc.3", default-features = false }
 subtle = { version = "2", default-features = false }
+
+# optional dependencies
+aes = { version = "0.9.0-rc.2", optional = true }
 zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]
-aead = { version = "0.6.0-rc.2", features = ["alloc", "dev"], default-features = false }
+aead = { version = "0.6.0-rc.3", features = ["alloc", "dev"], default-features = false }
 hex-literal = "1"
 
 [features]
-default = ["aes", "alloc", "os_rng"]
+default = ["aes", "alloc", "getrandom"]
 alloc = ["aead/alloc"]
+
 arrayvec = ["aead/arrayvec"]
 bytes = ["aead/bytes"]
-os_rng = ["aead/os_rng", "rand_core"]
+getrandom = ["aead/getrandom"]
 rand_core = ["aead/rand_core"]
 
 [package.metadata.docs.rs]

aes-gcm/Cargo.toml

@@ -12,16 +12,16 @@
 //!
 //! Simple usage (allocating, no associated data):
 //!
-#![cfg_attr(feature = "os_rng", doc = "```")]
-#![cfg_attr(not(feature = "os_rng"), doc = "```ignore")]
+#![cfg_attr(feature = "getrandom", doc = "```")]
+#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
 //! use aes_gcm::{
 //!     aead::{Aead, AeadCore, KeyInit, rand_core::OsRng},
 //!     Aes256Gcm, Nonce, Key // Or `Aes128Gcm`
 //! };
 //!
 //! # fn gen_key() -> Result<(), core::array::TryFromSliceError> {
 //! // The encryption key can be generated randomly:
-//! # #[cfg(feature = "os_rng")] {
+//! # #[cfg(feature = "getrandom")] {
 //! let key = Aes256Gcm::generate_key().expect("generate key");
 //! # }
 //!
@@ -67,8 +67,11 @@
 //! It can then be passed as the `buffer` parameter to the in-place encrypt
 //! and decrypt methods:
 //!
-#![cfg_attr(all(feature = "os_rng", feature = "arrayvec"), doc = "```")]
-#![cfg_attr(not(all(feature = "os_rng", feature = "arrayvec")), doc = "```ignore")]
+#![cfg_attr(all(feature = "getrandom", feature = "arrayvec"), doc = "```")]
+#![cfg_attr(
+    not(all(feature = "getrandom", feature = "arrayvec")),
+    doc = "```ignore"
+)]
 //! # fn main() -> Result<(), Box<dyn core::error::Error>> {
 //! use aes_gcm::{
 //!     aead::{AeadCore, AeadInOut, KeyInit, rand_core::OsRng, arrayvec::ArrayVec},