Skip to content

Commit 97eef46

Browse files
authored
Bump aead dependency to v0.6.0-rc.4 (#752)
This is primarily the documentation changes for the newly introduced `Generate` trait which subsumed the previous RNG APIs. See also: - RustCrypto/traits#2096 - RustCrypto/traits#2098
1 parent f48afcd commit 97eef46

File tree

24 files changed

+172
-142
lines changed

24 files changed

+172
-142
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aead-stream/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
1313
rust-version = "1.85"
1414

1515
[dependencies]
16-
aead = { version = "0.6.0-rc.3", default-features = false }
16+
aead = { version = "0.6.0-rc.4", default-features = false }
1717

1818
[features]
1919
alloc = ["aead/alloc"]

aes-gcm-siv/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ categories = ["cryptography", "no-std"]
1717
rust-version = "1.85"
1818

1919
[dependencies]
20-
aead = { version = "0.6.0-rc.3", default-features = false }
20+
aead = { version = "0.6.0-rc.4", default-features = false }
2121
aes = { version = "0.9.0-rc.2", optional = true }
2222
cipher = "0.5.0-rc.2"
2323
ctr = "0.10.0-rc.2"
@@ -26,7 +26,7 @@ subtle = { version = "2", default-features = false }
2626
zeroize = { version = "1", optional = true, default-features = false }
2727

2828
[dev-dependencies]
29-
aead = { version = "0.6.0-rc.3", features = ["dev"], default-features = false }
29+
aead = { version = "0.6.0-rc.4", features = ["dev"], default-features = false }
3030

3131
[features]
3232
default = ["aes", "alloc", "getrandom"]

aes-gcm-siv/src/lib.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@
1313
//!
1414
#![cfg_attr(feature = "getrandom", doc = "```")]
1515
#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
16-
//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
16+
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
17+
//! // NOTE: requires the `getrandom` feature is enabled
18+
//!
1719
//! use aes_gcm_siv::{
18-
//! aead::{Aead, AeadCore, KeyInit},
20+
//! aead::{Aead, AeadCore, Generate, Key, KeyInit},
1921
//! Aes256GcmSiv, Nonce // Or `Aes128GcmSiv`
2022
//! };
2123
//!
22-
//! let key = Aes256GcmSiv::generate_key().expect("key generation failure");
24+
//! let key = Key::<Aes256GcmSiv>::generate();
2325
//! let cipher = Aes256GcmSiv::new(&key);
2426
//!
25-
//! let nonce = Aes256GcmSiv::generate_nonce().expect("nonce failure"); // MUST be unique per message
27+
//! let nonce = Nonce::generate(); // MUST be unique per message
2628
//! let ciphertext = cipher.encrypt(&nonce, b"plaintext message".as_ref())?;
2729
//!
2830
//! let plaintext = cipher.decrypt(&nonce, ciphertext.as_ref())?;
@@ -54,16 +56,18 @@
5456
not(all(feature = "getrandom", feature = "arrayvec")),
5557
doc = "```ignore"
5658
)]
57-
//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
59+
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
60+
//! // NOTE: requires the `arrayvec` and `getrandom` features are enabled
61+
//!
5862
//! use aes_gcm_siv::{
59-
//! aead::{AeadInOut, AeadCore, Buffer, KeyInit, arrayvec::ArrayVec},
63+
//! aead::{AeadInOut, AeadCore, Buffer, Generate, Key, KeyInit, arrayvec::ArrayVec},
6064
//! Aes256GcmSiv, Nonce, // Or `Aes128GcmSiv`
6165
//! };
6266
//!
63-
//! let key = Aes256GcmSiv::generate_key().expect("key generation failure");
67+
//! let key = Key::<Aes256GcmSiv>::generate();
6468
//! let cipher = Aes256GcmSiv::new(&key);
6569
//!
66-
//! let nonce = Aes256GcmSiv::generate_nonce().expect("nonce failure"); // 96-bits; unique per message
70+
//! let nonce = Nonce::generate(); // 96-bits; unique per message
6771
//! let mut buffer: ArrayVec<u8, 128> = ArrayVec::new(); // Note: buffer needs 16-bytes overhead for auth tag
6872
//! buffer.extend_from_slice(b"plaintext message");
6973
//!

aes-gcm/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ categories = ["cryptography", "no-std"]
1717
rust-version = "1.85"
1818

1919
[dependencies]
20-
aead = { version = "0.6.0-rc.3", default-features = false }
20+
aead = { version = "0.6.0-rc.4", default-features = false }
2121
cipher = "0.5.0-rc.2"
2222
ctr = "0.10.0-rc.2"
2323
ghash = { version = "0.6.0-rc.3", default-features = false }
@@ -28,7 +28,7 @@ aes = { version = "0.9.0-rc.2", optional = true }
2828
zeroize = { version = "1", optional = true, default-features = false }
2929

3030
[dev-dependencies]
31-
aead = { version = "0.6.0-rc.3", features = ["alloc", "dev"], default-features = false }
31+
aead = { version = "0.6.0-rc.4", features = ["alloc", "dev"], default-features = false }
3232
hex-literal = "1"
3333

3434
[features]

aes-gcm/src/lib.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
#![cfg_attr(feature = "getrandom", doc = "```")]
1616
#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
1717
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
18+
//! // NOTE: requires the `getrandom` feature is enabled
19+
//!
1820
//! use aes_gcm::{
19-
//! aead::{Aead, AeadCore, KeyInit},
20-
//! Aes256Gcm, Nonce, Key // Or `Aes128Gcm`
21+
//! aead::{Aead, AeadCore, Generate, Key, KeyInit},
22+
//! Aes256Gcm, Nonce, // Or `Aes128Gcm`
2123
//! };
2224
//!
23-
//! let key = Aes256Gcm::generate_key().expect("generate key");
25+
//! let key = Key::<Aes256Gcm>::generate();
2426
//! let cipher = Aes256Gcm::new(&key);
2527
//!
26-
//! let nonce = Aes256Gcm::generate_nonce().expect("generate nonce"); // MUST be unique per message
28+
//! let nonce = Nonce::generate(); // MUST be unique per message
2729
//! let ciphertext = cipher.encrypt(&nonce, b"plaintext message".as_ref())?;
2830
//!
2931
//! let plaintext = cipher.decrypt(&nonce, ciphertext.as_ref())?;
@@ -56,15 +58,17 @@
5658
doc = "```ignore"
5759
)]
5860
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
61+
//! // NOTE: requires the `arrayvec` and `getrandom` features are enabled
62+
//!
5963
//! use aes_gcm::{
60-
//! aead::{AeadCore, AeadInOut, KeyInit, arrayvec::ArrayVec},
64+
//! aead::{AeadCore, AeadInOut, Generate, Key, KeyInit, arrayvec::ArrayVec},
6165
//! Aes256Gcm, Nonce, // Or `Aes128Gcm`
6266
//! };
6367
//!
64-
//! let key = Aes256Gcm::generate_key().expect("key generation failure");
68+
//! let key = Key::<Aes256Gcm>::generate();
6569
//! let cipher = Aes256Gcm::new(&key);
6670
//!
67-
//! let nonce = Aes256Gcm::generate_nonce().expect("nonce failure"); // MUST be unique per message
71+
//! let nonce = Nonce::generate(); // MUST be unique per message
6872
//! let mut buffer: ArrayVec<u8, 128> = ArrayVec::new(); // Note: buffer needs 16-bytes overhead for auth tag
6973
//! buffer.try_extend_from_slice(b"plaintext message").unwrap();
7074
//!

aes-siv/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ categories = ["cryptography", "no-std"]
1717
rust-version = "1.85"
1818

1919
[dependencies]
20-
aead = "0.6.0-rc.3"
20+
aead = "0.6.0-rc.4"
2121
aes = "0.9.0-rc.2"
2222
cipher = "0.5.0-rc.2"
2323
cmac = "0.8.0-rc.3"
@@ -30,7 +30,7 @@ pmac = { version = "0.8.0-rc.3", optional = true }
3030
zeroize = { version = "1", optional = true, default-features = false }
3131

3232
[dev-dependencies]
33-
aead = { version = "0.6.0-rc.3", features = ["alloc", "dev"], default-features = false }
33+
aead = { version = "0.6.0-rc.4", features = ["alloc", "dev"], default-features = false }
3434
blobby = "0.4"
3535
hex-literal = "1"
3636

aes-siv/src/lib.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@
1414
#![cfg_attr(feature = "getrandom", doc = "```")]
1515
#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
1616
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
17+
//! // NOTE: requires the `getrandom` feature is enabled
18+
//!
1719
//! use aes_siv::{
18-
//! aead::{Aead, AeadCore, KeyInit},
20+
//! aead::{Aead, AeadCore, Generate, Key, KeyInit},
1921
//! Aes256SivAead, Nonce // Or `Aes128SivAead`
2022
//! };
2123
//!
22-
//! let key = Aes256SivAead::generate_key().expect("key generation failure");
24+
//! let key = Key::<Aes256SivAead>::generate();
2325
//! let cipher = Aes256SivAead::new(&key);
2426
//!
25-
//! let nonce = Aes256SivAead::generate_nonce().expect("nonce failure"); // MUST be unique per message
27+
//! let nonce = Nonce::generate(); // MUST be unique per message
2628
//! let ciphertext = cipher.encrypt(&nonce, b"plaintext message".as_ref())?;
2729
//!
2830
//! let plaintext = cipher.decrypt(&nonce, ciphertext.as_ref())?;
@@ -55,15 +57,17 @@
5557
doc = "```ignore"
5658
)]
5759
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
60+
//! // NOTE: requires the `arrayvec` and `getrandom` features are enabled
61+
//!
5862
//! use aes_siv::{
59-
//! aead::{AeadCore, AeadInOut, KeyInit, arrayvec::ArrayVec},
63+
//! aead::{AeadCore, AeadInOut, Generate, Key, KeyInit, arrayvec::ArrayVec},
6064
//! Aes256SivAead, Nonce, // Or `Aes128SivAead`
6165
//! };
6266
//!
63-
//! let key = Aes256SivAead::generate_key().expect("key generation failure");
67+
//! let key = Key::<Aes256SivAead>::generate();
6468
//! let cipher = Aes256SivAead::new(&key);
6569
//!
66-
//! let nonce = Aes256SivAead::generate_nonce().expect("nonce failure"); // MUST be unique per message
70+
//! let nonce = Nonce::generate(); // MUST be unique per message
6771
//! let mut buffer: ArrayVec<u8, 128> = ArrayVec::new(); // Note: buffer needs 16-bytes overhead for auth tag
6872
//! buffer.try_extend_from_slice(b"plaintext message").unwrap();
6973
//!

ascon-aead128/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ categories = ["cryptography", "no-std"]
1212
rust-version = "1.85"
1313

1414
[dependencies]
15-
aead = { version = "0.6.0-rc.3", default-features = false }
15+
aead = { version = "0.6.0-rc.4", default-features = false }
1616
subtle = { version = "2", default-features = false }
1717
zeroize = { version = "1.8", optional = true, default-features = false, features = ["derive"] }
1818
ascon = "0.5.0-rc.0"
1919

2020
[dev-dependencies]
21-
aead = { version = "0.6.0-rc.3", features = ["dev"] }
21+
aead = { version = "0.6.0-rc.4", features = ["dev"] }
2222

2323
[features]
2424
default = ["alloc", "getrandom"]

ascon-aead128/src/lib.rs

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,17 @@
1414
#![cfg_attr(feature = "getrandom", doc = "```")]
1515
#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
1616
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
17+
//! // NOTE: requires the `getrandom` feature is enabled
18+
//!
1719
//! use ascon_aead128::{
18-
//! AsconAead128, Key, Nonce,
19-
//! aead::{Aead, KeyInit, AeadCore}
20+
//! aead::{Aead, Generate, KeyInit, AeadCore},
21+
//! AsconAead128, AsconAead128Key, AsconAead128Nonce
2022
//! };
2123
//!
22-
//! let key = AsconAead128::generate_key().expect("key generation failure");
24+
//! let key = AsconAead128Key::generate();
2325
//! let cipher = AsconAead128::new(&key);
2426
//!
25-
//! let nonce = AsconAead128::generate_nonce().expect("generate nonce"); // MUST be unique per message
26-
//! let ciphertext = cipher.encrypt(&nonce, b"plaintext message".as_ref())?;
27-
//!
28-
//! let plaintext = cipher.decrypt(&nonce, ciphertext.as_ref())?;
29-
//! assert_eq!(&plaintext, b"plaintext message");
30-
//! # Ok(())
31-
//! # }
32-
//! ```
33-
//!
34-
//! With randomly sampled keys and nonces (requires `getrandom` feature):
35-
//!
36-
#![cfg_attr(feature = "getrandom", doc = "```")]
37-
#![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
38-
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
39-
//! use ascon_aead128::{AsconAead128, aead::{Aead, AeadCore, KeyInit}};
40-
//!
41-
//! let key = AsconAead128::generate_key().expect("key generation failure");
42-
//! let cipher = AsconAead128::new(&key);
43-
//!
44-
//! let nonce = AsconAead128::generate_nonce().expect("generate nonce"); // MUST be unique per message
27+
//! let nonce = AsconAead128Nonce::generate(); // MUST be unique per message
4528
//! let ciphertext = cipher.encrypt(&nonce, b"plaintext message".as_ref())?;
4629
//!
4730
//! let plaintext = cipher.decrypt(&nonce, ciphertext.as_ref())?;
@@ -74,15 +57,17 @@
7457
doc = "```ignore"
7558
)]
7659
//! # fn main() -> Result<(), Box<dyn core::error::Error>> {
60+
//! // NOTE: requires the `arrayvec` and `getrandom` features are enabled
61+
//!
7762
//! use ascon_aead128::{
78-
//! AsconAead128, Key, Nonce,
79-
//! aead::{AeadCore, AeadInOut, KeyInit, arrayvec::ArrayVec}
63+
//! aead::{AeadCore, AeadInOut, Generate, KeyInit, arrayvec::ArrayVec},
64+
//! AsconAead128, AsconAead128Key, AsconAead128Nonce
8065
//! };
8166
//!
82-
//! let key = AsconAead128::generate_key().expect("key generation failure");
67+
//! let key = AsconAead128Key::generate();
8368
//! let cipher = AsconAead128::new(&key);
8469
//!
85-
//! let nonce = AsconAead128::generate_nonce().expect("generate nonce"); // MUST be unique per message
70+
//! let nonce = AsconAead128Nonce::generate(); // MUST be unique per message
8671
//! let mut buffer: ArrayVec<u8, 128> = ArrayVec::new(); // Buffer needs 16-bytes overhead for authentication tag
8772
//! buffer.try_extend_from_slice(b"plaintext message").unwrap();
8873
//!

0 commit comments

Comments
 (0)