From 5b897935e34da9dc2b02a4a794d935919bbe5e84 Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Mon, 9 Jan 2023 18:30:17 +1100
Subject: [PATCH 1/8] Make rand_core optional

---
 Cargo.toml       | 16 ++++++++--------
 src/lib.rs       | 32 ++++++++++++++++----------------
 src/signing.rs   | 17 ++++++++++++-----
 tests/ed25519.rs |  6 ++----
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5bb136e..834de0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,10 +24,9 @@ rustdoc-args = ["--cfg", "docsrs"]
 features = ["nightly", "batch", "pkcs8"]
 
 [dependencies]
-curve25519-dalek = { version = "=4.0.0-pre.3", default-features = false, features = ["digest", "rand_core"] }
+curve25519-dalek = { version = "=4.0.0-pre.3", default-features = false, features = ["digest"] }
 ed25519 = { version = "=2.0.0-rc.0", default-features = false }
 merlin = { version = "3", default-features = false, optional = true }
-rand = { version = "0.8", default-features = false, optional = true }
 rand_core = { version = "0.6.4", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, optional = true }
 serde_bytes = { version = "0.11", optional = true }
@@ -35,6 +34,7 @@ sha2 = { version = "0.10", default-features = false }
 zeroize = { version = "1.5", default-features = false }
 
 [dev-dependencies]
+curve25519-dalek = { version = "=4.0.0-pre.3", default-features = false, features = ["digest", "rand_core"] }
 hex = "0.4"
 bincode = "1.0"
 serde_json = "1.0"
@@ -50,17 +50,17 @@ name = "ed25519_benchmarks"
 harness = false
 
 [features]
-default = ["std", "rand"]
-alloc = ["curve25519-dalek/alloc", "ed25519/alloc", "rand?/alloc", "serde?/alloc", "zeroize/alloc"]
-std = ["alloc", "ed25519/std", "rand?/std", "serde?/std", "sha2/std"]
+default = ["std"]
+alloc = ["curve25519-dalek/alloc", "ed25519/alloc", "serde?/alloc", "zeroize/alloc"]
+std = ["alloc", "ed25519/std", "serde?/std", "sha2/std"]
 
 asm = ["sha2/asm"]
-batch = ["alloc", "merlin", "rand"]
+batch = ["alloc", "merlin", "rand_core"]
 # This feature enables deterministic batch verification.
-batch_deterministic = ["alloc", "merlin", "rand"]
+batch_deterministic = ["alloc", "merlin", "rand_core"]
 # This features turns off stricter checking for scalar malleability in signatures
 legacy_compatibility = []
 pkcs8 = ["ed25519/pkcs8"]
 pem = ["alloc", "ed25519/pem", "pkcs8"]
-rand = ["dep:rand", "dep:rand_core"]
+rand_core = ["dep:rand_core", "curve25519-dalek/rand_core"]
 serde = ["dep:serde", "serde_bytes", "ed25519/serde"]
diff --git a/src/lib.rs b/src/lib.rs
index edb5b98..6c543ad 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,8 +18,8 @@
 //! secure pseudorandom number generator (CSPRNG). For this example, we'll use
 //! the operating system's builtin PRNG:
 //!
-#![cfg_attr(feature = "rand", doc = "```")]
-#![cfg_attr(not(feature = "rand"), doc = "```ignore")]
+#![cfg_attr(feature = "rand_core", doc = "```")]
+#![cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
 //! # fn main() {
 //! use rand::rngs::OsRng;
 //! use ed25519_dalek::SigningKey;
@@ -32,8 +32,8 @@
 //!
 //! We can now use this `signing_key` to sign a message:
 //!
-#![cfg_attr(feature = "rand", doc = "```")]
-#![cfg_attr(not(feature = "rand"), doc = "```ignore")]
+#![cfg_attr(feature = "rand_core", doc = "```")]
+#![cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
 //! # fn main() {
 //! # use rand::rngs::OsRng;
 //! # use ed25519_dalek::SigningKey;
@@ -48,8 +48,8 @@
 //! As well as to verify that this is, indeed, a valid signature on
 //! that `message`:
 //!
-#![cfg_attr(feature = "rand", doc = "```")]
-#![cfg_attr(not(feature = "rand"), doc = "```ignore")]
+#![cfg_attr(feature = "rand_core", doc = "```")]
+#![cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
 //! # fn main() {
 //! # use rand::rngs::OsRng;
 //! # use ed25519_dalek::{SigningKey, Signature, Signer};
@@ -65,8 +65,8 @@
 //! Anyone else, given the `public` half of the `signing_key` can also easily
 //! verify this signature:
 //!
-#![cfg_attr(feature = "rand", doc = "```")]
-#![cfg_attr(not(feature = "rand"), doc = "```ignore")]
+#![cfg_attr(feature = "rand_core", doc = "```")]
+#![cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
 //! # fn main() {
 //! # use rand::rngs::OsRng;
 //! # use ed25519_dalek::SigningKey;
@@ -91,8 +91,8 @@
 //! secret key to anyone else, since they will only need the public key to
 //! verify your signatures!)
 //!
-#![cfg_attr(feature = "rand", doc = "```")]
-#![cfg_attr(not(feature = "rand"), doc = "```ignore")]
+#![cfg_attr(feature = "rand_core", doc = "```")]
+#![cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
 //! # fn main() {
 //! # use rand::rngs::OsRng;
 //! # use ed25519_dalek::{SigningKey, Signature, Signer, VerifyingKey};
@@ -111,8 +111,8 @@
 //!
 //! And similarly, decoded from bytes with `::from_bytes()`:
 //!
-#![cfg_attr(feature = "rand", doc = "```")]
-#![cfg_attr(not(feature = "rand"), doc = "```ignore")]
+#![cfg_attr(feature = "rand_core", doc = "```")]
+#![cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
 //! # use std::convert::TryFrom;
 //! # use rand::rngs::OsRng;
 //! # use std::convert::TryInto;
@@ -189,8 +189,8 @@
 //! They can be then serialised into any of the wire formats which serde supports.
 //! For example, using [bincode](https://github.com/TyOverby/bincode):
 //!
-#![cfg_attr(all(feature = "rand", feature = "serde"), doc = "```")]
-#![cfg_attr(not(all(feature = "rand", feature = "serde")), doc = "```ignore")]
+#![cfg_attr(all(feature = "rand_core", feature = "serde"), doc = "```")]
+#![cfg_attr(not(all(feature = "rand_core", feature = "serde")), doc = "```ignore")]
 //! # fn main() {
 //! # use rand::rngs::OsRng;
 //! # use ed25519_dalek::{SigningKey, Signature, Signer, Verifier, VerifyingKey};
@@ -210,8 +210,8 @@
 //! After sending the `encoded_verifying_key` and `encoded_signature`, the
 //! recipient may deserialise them and verify:
 //!
-#![cfg_attr(all(feature = "rand", feature = "serde"), doc = "```")]
-#![cfg_attr(not(all(feature = "rand", feature = "serde")), doc = "```ignore")]
+#![cfg_attr(all(feature = "rand_core", feature = "serde"), doc = "```")]
+#![cfg_attr(not(all(feature = "rand_core", feature = "serde")), doc = "```ignore")]
 //! # fn main() {
 //! # use rand::rngs::OsRng;
 //! # use ed25519_dalek::{SigningKey, Signature, Signer, Verifier, VerifyingKey};
diff --git a/src/signing.rs b/src/signing.rs
index d7e784f..c06b9b1 100644
--- a/src/signing.rs
+++ b/src/signing.rs
@@ -12,7 +12,7 @@
 #[cfg(feature = "pkcs8")]
 use ed25519::pkcs8::{self, DecodePrivateKey};
 
-#[cfg(feature = "rand")]
+#[cfg(any(test, feature = "rand_core"))]
 use rand_core::CryptoRngCore;
 
 #[cfg(feature = "serde")]
@@ -152,6 +152,7 @@ impl SigningKey {
         self.verifying_key
     }
 
+    #[cfg(any(test, feature = "rand_core"))]
     /// Generate an ed25519 signing key.
     ///
     /// # Example
@@ -182,7 +183,10 @@ impl SigningKey {
     /// The standard hash function used for most ed25519 libraries is SHA-512,
     /// which is available with `use sha2::Sha512` as in the example above.
     /// Other suitable hash functions include Keccak-512 and Blake2b-512.
-    #[cfg(feature = "rand")]
+    ///
+    /// # Features
+    ///
+    /// Requires optional feature `rand_core` activated
     pub fn generate<R: CryptoRngCore + ?Sized>(csprng: &mut R) -> SigningKey {
         let mut secret = SecretKey::default();
         csprng.fill_bytes(&mut secret);
@@ -207,7 +211,8 @@ impl SigningKey {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "rand_core", doc = "```")]
+    #[cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
     /// use ed25519_dalek::Digest;
     /// use ed25519_dalek::SigningKey;
     /// use ed25519_dalek::Sha512;
@@ -251,7 +256,8 @@ impl SigningKey {
     /// Let's add a context for good measure (remember, you'll want to choose
     /// your own!):
     ///
-    /// ```
+    #[cfg_attr(feature = "rand_core", doc = "```")]
+    #[cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
     /// # use ed25519_dalek::Digest;
     /// # use ed25519_dalek::SigningKey;
     /// # use ed25519_dalek::Signature;
@@ -324,7 +330,8 @@ impl SigningKey {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "rand_core", doc = "```")]
+    #[cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
     /// use ed25519_dalek::Digest;
     /// use ed25519_dalek::SigningKey;
     /// use ed25519_dalek::Signature;
diff --git a/tests/ed25519.rs b/tests/ed25519.rs
index 1a65d90..4e92f08 100644
--- a/tests/ed25519.rs
+++ b/tests/ed25519.rs
@@ -16,9 +16,6 @@ use ed25519_dalek::*;
 use hex::FromHex;
 use hex_literal::hex;
 
-#[cfg(feature = "rand")]
-use sha2::Sha512;
-
 #[cfg(test)]
 mod vectors {
     use super::*;
@@ -281,10 +278,11 @@ mod vectors {
     }
 }
 
-#[cfg(feature = "rand")]
+#[cfg(feature = "rand_core")]
 mod integrations {
     use super::*;
     use rand::rngs::OsRng;
+    use sha2::Sha512;
 
     #[test]
     fn sign_verify() {

From 9207836dab72f06592dedd04a26076357f20ce06 Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Mon, 9 Jan 2023 18:34:29 +1100
Subject: [PATCH 2/8] Bench requires features rand_core

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index 834de0f..fe22dd8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,6 +48,7 @@ toml = { version = "0.5" }
 [[bench]]
 name = "ed25519_benchmarks"
 harness = false
+required-features = ["rand_core"]
 
 [features]
 default = ["std"]

From b7abbc1f230e39121d6014f8b3546704ada7108e Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:01:23 +1100
Subject: [PATCH 3/8] Add CI

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 777219c..387e3b0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -31,6 +31,7 @@ jobs:
       - run: cargo test --target ${{ matrix.target }}
       - run: cargo test --target ${{ matrix.target }} --features batch
       - run: cargo test --target ${{ matrix.target }} --features batch_deterministic
+      - run: cargo test --target ${{ matrix.target }} --features rand_core
       - run: cargo test --target ${{ matrix.target }} --features serde
       - run: cargo test --target ${{ matrix.target }} --features pem
 

From 762d1ab2d2583ce4983332390c5846adea87e0ec Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Sun, 15 Jan 2023 14:39:36 +1100
Subject: [PATCH 4/8] fix curve pre version

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 350710c..6e9144c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ sha2 = { version = "0.10", default-features = false }
 zeroize = { version = "1.5", default-features = false, optional = true }
 
 [dev-dependencies]
-curve25519-dalek = { version = "=4.0.0-pre.3", default-features = false, features = ["digest", "rand_core"] }
+curve25519-dalek = { version = "=4.0.0-pre.5", default-features = false, features = ["digest", "rand_core"] }
 hex = "0.4"
 bincode = "1.0"
 serde_json = "1.0"

From bd2d986bb3150bc6edece88f5d5c0ae805f3c0c4 Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Sun, 15 Jan 2023 14:51:44 +1100
Subject: [PATCH 5/8] curve25519 rand_core feature is not required

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6e9144c..99d51bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,7 @@ batch = ["alloc", "merlin", "rand_core"]
 legacy_compatibility = []
 pkcs8 = ["ed25519/pkcs8"]
 pem = ["alloc", "ed25519/pem", "pkcs8"]
-rand_core = ["dep:rand_core", "curve25519-dalek/rand_core"]
+rand_core = ["dep:rand_core"]
 serde = ["dep:serde", "serde_bytes", "ed25519/serde"]
 zeroize = ["dep:zeroize", "curve25519-dalek/zeroize"]
 

From 9769e9edc7cbf43959dc6d31fa3701a89292267c Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Mon, 16 Jan 2023 03:46:11 +1100
Subject: [PATCH 6/8] Fix doc attr for generate

---
 src/signing.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/signing.rs b/src/signing.rs
index 586f3ca..c88f81a 100644
--- a/src/signing.rs
+++ b/src/signing.rs
@@ -154,6 +154,7 @@ impl SigningKey {
     }
 
     #[cfg(any(test, feature = "rand_core"))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rand_core")))]
     /// Generate an ed25519 signing key.
     ///
     /// # Example
@@ -184,10 +185,6 @@ impl SigningKey {
     /// The standard hash function used for most ed25519 libraries is SHA-512,
     /// which is available with `use sha2::Sha512` as in the example above.
     /// Other suitable hash functions include Keccak-512 and Blake2b-512.
-    ///
-    /// # Features
-    ///
-    /// Requires optional feature `rand_core` activated
     pub fn generate<R: CryptoRngCore + ?Sized>(csprng: &mut R) -> SigningKey {
         let mut secret = SecretKey::default();
         csprng.fill_bytes(&mut secret);

From a8addcc07393ee80581489416f0734a4d2345ae0 Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Mon, 16 Jan 2023 03:57:17 +1100
Subject: [PATCH 7/8] Style

---
 src/signing.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/signing.rs b/src/signing.rs
index c88f81a..e4117be 100644
--- a/src/signing.rs
+++ b/src/signing.rs
@@ -153,8 +153,6 @@ impl SigningKey {
         self.verifying_key
     }
 
-    #[cfg(any(test, feature = "rand_core"))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "rand_core")))]
     /// Generate an ed25519 signing key.
     ///
     /// # Example
@@ -185,6 +183,8 @@ impl SigningKey {
     /// The standard hash function used for most ed25519 libraries is SHA-512,
     /// which is available with `use sha2::Sha512` as in the example above.
     /// Other suitable hash functions include Keccak-512 and Blake2b-512.
+    #[cfg(any(test, feature = "rand_core"))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rand_core")))]
     pub fn generate<R: CryptoRngCore + ?Sized>(csprng: &mut R) -> SigningKey {
         let mut secret = SecretKey::default();
         csprng.fill_bytes(&mut secret);

From 650f4975469fae3e42c14c7705a662c2acff9f9d Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Mon, 16 Jan 2023 04:04:42 +1100
Subject: [PATCH 8/8] doc_auto_cfg is already used

---
 src/signing.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/signing.rs b/src/signing.rs
index e4117be..df828a6 100644
--- a/src/signing.rs
+++ b/src/signing.rs
@@ -184,7 +184,6 @@ impl SigningKey {
     /// which is available with `use sha2::Sha512` as in the example above.
     /// Other suitable hash functions include Keccak-512 and Blake2b-512.
     #[cfg(any(test, feature = "rand_core"))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "rand_core")))]
     pub fn generate<R: CryptoRngCore + ?Sized>(csprng: &mut R) -> SigningKey {
         let mut secret = SecretKey::default();
         csprng.fill_bytes(&mut secret);