Merge pull request #22 from rdragos/chore/rand-0.10

Migrate HPKE RNG API to rand_core 0.10

Author: nadimkobeissi

Cargo.toml

@@ -13,30 +13,28 @@ categories   = ["cryptography", "no-std"]
 [dependencies]
 zeroize          = { version = "1.8",  default-features = false, features = ["derive", "alloc"] }
 subtle           = { version = "2.6",  default-features = false }
-rand_core        = { version = "0.9",  default-features = false }
-rand_core_06     = { package = "rand_core", version = "0.6", default-features = false }
-rand_core_10     = { package = "rand_core", version = "0.10", default-features = false, optional = true }
+rand_core        = { version = "0.10", default-features = false }
 hkdf             = { version = "0.13", default-features = false }
 sha2             = { version = "0.11", default-features = false }
 sha3             = { version = "0.12", default-features = false }
 shake            = { version = "0.1",  default-features = false, optional = true }
 aead             = { version = "0.5",  default-features = false, features = ["alloc"] }
 aes-gcm          = { version = "0.10", default-features = false, features = ["aes", "alloc", "zeroize"] }
 chacha20poly1305 = { version = "0.10", default-features = false, features = ["alloc"] }
-x25519-dalek     = { version = "2",    default-features = false, features = ["zeroize", "static_secrets"] }
+x25519-dalek     = { version = "3",    default-features = false, features = ["zeroize", "static_secrets"] }
 ed448-goldilocks = { version = "0.14.0-pre.12", default-features = false }
-p256             = { version = "0.13", default-features = false, features = ["arithmetic", "ecdh"] }
-p384             = { version = "0.13", default-features = false, features = ["arithmetic", "ecdh"] }
-p521             = { version = "0.13", default-features = false, features = ["arithmetic", "ecdh"] }
-k256             = { version = "0.13", default-features = false, features = ["arithmetic", "ecdh"] }
+p256             = { version = "0.14", default-features = false, features = ["arithmetic", "ecdh"] }
+p384             = { version = "0.14", default-features = false, features = ["arithmetic", "ecdh"] }
+p521             = { version = "0.14", default-features = false, features = ["arithmetic", "ecdh"] }
+k256             = { version = "0.14", default-features = false, features = ["arithmetic", "ecdh"] }
 ml-kem           = { version = "0.3.2", default-features = false, features = ["zeroize"], optional = true }
-x-wing           = { version = "0.1.0-rc.0", default-features = false, features = ["zeroize"], optional = true }
+x-wing           = { version = "0.1.0", default-features = false, features = ["zeroize"], optional = true }
 serde            = { version = "1",    default-features = false, features = ["derive"], optional = true }
 
 [features]
 default       = ["std"]
-std           = ["rand_core/std", "subtle/std", "aes-gcm/std", "chacha20poly1305/std"]
-pq            = ["dep:ml-kem", "dep:x-wing", "dep:rand_core_10", "dep:shake"]
+std           = ["subtle/std", "aes-gcm/std", "chacha20poly1305/std"]
+pq            = ["dep:ml-kem", "dep:x-wing", "dep:shake"]
 serde         = ["dep:serde"]
 differential  = []
 comparative   = ["pq"]
@@ -49,11 +47,11 @@ hpke-rs-crypto      = "0.6"
 serde               = { version = "1", features = ["derive"] }
 serde_json          = "1"
 trybuild            = { version = "1", features = ["diff"] }
-rand                = "0.9"
-rand_chacha         = "0.9"
+rand                = "0.10"
+rand_chacha         = "0.10"
 criterion           = { version = "0.8", features = ["html_reports"] }
 hex                 = "0.4"
-hpke                = { package = "hpke", git = "https://github.com/rozbb/rust-hpke", rev = "2cbc9ca", features = ["x25519", "p256", "aes", "chacha", "alloc", "xwing"] }
+hpke                = { package = "hpke", git = "https://github.com/rozbb/rust-hpke", rev = "57b14d8", features = ["x25519", "nistp", "aes", "chacha", "alloc", "mlkem"] }
 
 [profile.bench]
 lto = "thin"

README.md

@@ -9,12 +9,13 @@ A clean-slate Rust implementation of [HPKE (RFC 9180)](https://www.rfc-editor.or
 
 ```rust
 use hpke_ng::*;
-use rand_core::OsRng;
+use rand::rngs::SysRng;
+use rand_core::UnwrapErr;
 
 type Suite = Hpke<DhKemX25519HkdfSha256, HkdfSha256, ChaCha20Poly1305>;
 
-let mut os = OsRng;
-let mut rng = os.unwrap_mut();
+let mut os = SysRng;
+let mut rng = UnwrapErr(&mut os);
 let (sk_r, pk_r) = DhKemX25519HkdfSha256::generate(&mut rng)?;
 let (enc, ct)  = Suite::seal_base(&mut rng, &pk_r, b"info", b"aad", b"hello")?;
 let pt         = Suite::open_base(&enc, &sk_r, b"info", b"aad", &ct)?;