From edb7a69eef251fbca7bc36fe15d7a586b49a099c Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 11 Nov 2023 18:03:25 -0700 Subject: [PATCH 1/2] crypto-common: weakly activate `rand_core/getrandom` When both `getrandom` and `rand_core` are enabled, activates the `rand_core/getrandom` feature, which makes `OsRng` available as `crypto_common::rand_core::OsRng`. --- Cargo.lock | 1 + crypto-common/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index b9bfc7bb..c8aae208 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -286,6 +286,7 @@ dependencies = [ name = "crypto-common" version = "0.2.0-pre" dependencies = [ + "getrandom", "hybrid-array", "rand_core 0.6.4", ] diff --git a/crypto-common/Cargo.toml b/crypto-common/Cargo.toml index 38496ad5..e0e7dd09 100644 --- a/crypto-common/Cargo.toml +++ b/crypto-common/Cargo.toml @@ -20,6 +20,7 @@ rand_core = { version = "0.6.4", optional = true } getrandom = { version = "0.2", optional = true } [features] +getrandom = ["dep:getrandom", "rand_core?/getrandom"] std = [] [package.metadata.docs.rs] From 16fbcdb0931e6101df741767332c8684645c66f5 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 11 Nov 2023 18:15:59 -0700 Subject: [PATCH 2/2] Re-export getrandom --- crypto-common/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto-common/src/lib.rs b/crypto-common/src/lib.rs index 5fb3a814..247746a6 100644 --- a/crypto-common/src/lib.rs +++ b/crypto-common/src/lib.rs @@ -12,6 +12,8 @@ #[cfg(feature = "std")] extern crate std; +#[cfg(feature = "getrandom")] +pub use getrandom; #[cfg(feature = "rand_core")] pub use rand_core;