From fdc992d6cd2156d976626824cf1dce35af7f246b Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Sun, 12 Mar 2023 14:18:07 +1100
Subject: [PATCH 1/2] Fix no_std with get_random

---
 Cargo.toml    |  4 +++-
 src/lib.rs    | 15 ++++++++++-----
 src/x25519.rs |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5441ff1..104d3e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ features = ["nightly", "reusable_secrets", "serde"]
 
 [dependencies]
 curve25519-dalek = { version = "4.0.0-rc.0", default-features = false }
-rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
+rand_core = { version = "0.6", default-features = false }
 serde = { version = "1", default-features = false, optional = true, features = ["derive"] }
 zeroize = { version = "1", default-features = false, optional = true, features = ["zeroize_derive"] }
 
@@ -55,3 +55,5 @@ serde = ["dep:serde", "curve25519-dalek/serde"]
 alloc = ["curve25519-dalek/alloc", "serde?/alloc", "zeroize?/alloc"]
 precomputed-tables = ["curve25519-dalek/precomputed-tables"]
 reusable_secrets = []
+# docs: docsrs and doctest features
+docsrs = ["rand_core/getrandom"]
diff --git a/src/lib.rs b/src/lib.rs
index 01369d0..b4b1541 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,7 +53,8 @@
 //! First, Alice uses `EphemeralSecret::new()` and then
 //! `PublicKey::from()` to produce her secret and public keys:
 //!
-//! ```rust
+#![cfg_attr(feature = "docsrs", doc = "```")]
+#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
 //! use rand_core::OsRng;
 //! use x25519_dalek::{EphemeralSecret, PublicKey};
 //!
@@ -63,7 +64,8 @@
 //!
 //! Bob does the same:
 //!
-//! ```rust
+#![cfg_attr(feature = "docsrs", doc = "```")]
+#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! let bob_secret = EphemeralSecret::new(OsRng);
@@ -74,7 +76,8 @@
 //! loudly meows `bob_public` back to Alice.  Alice now computes her
 //! shared secret with Bob by doing:
 //!
-//! ```rust
+#![cfg_attr(feature = "docsrs", doc = "```")]
+#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! # let alice_secret = EphemeralSecret::new(OsRng);
@@ -86,7 +89,8 @@
 //!
 //! Similarly, Bob computes a shared secret by doing:
 //!
-//! ```rust
+#![cfg_attr(feature = "docsrs", doc = "```")]
+#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! # let alice_secret = EphemeralSecret::new(OsRng);
@@ -98,7 +102,8 @@
 //!
 //! These secrets are the same:
 //!
-//! ```rust
+#![cfg_attr(feature = "docsrs", doc = "```")]
+#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! # let alice_secret = EphemeralSecret::new(OsRng);
diff --git a/src/x25519.rs b/src/x25519.rs
index 442f17d..29c9c1a 100644
--- a/src/x25519.rs
+++ b/src/x25519.rs
@@ -267,7 +267,8 @@ impl SharedSecret {
 /// cannot use the better, safer, and faster ephemeral DH API.
 ///
 /// # Example
-/// ```
+#[cfg_attr(feature = "docsrs", doc = "```")]
+#[cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
 /// use rand_core::OsRng;
 /// use rand_core::RngCore;
 ///

From f3c46bc3bf8d0cc77542556de79fdd3329508ccf Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Sun, 12 Mar 2023 15:27:53 +1100
Subject: [PATCH 2/2] Remove redundant feature

---
 Cargo.toml    |  3 +--
 src/lib.rs    | 15 +++++----------
 src/x25519.rs |  3 +--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 104d3e4..167139f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,7 @@ zeroize = { version = "1", default-features = false, optional = true, features =
 [dev-dependencies]
 bincode = "1"
 criterion = "0.3.0"
+rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
 
 [[bench]]
 name = "x25519"
@@ -55,5 +56,3 @@ serde = ["dep:serde", "curve25519-dalek/serde"]
 alloc = ["curve25519-dalek/alloc", "serde?/alloc", "zeroize?/alloc"]
 precomputed-tables = ["curve25519-dalek/precomputed-tables"]
 reusable_secrets = []
-# docs: docsrs and doctest features
-docsrs = ["rand_core/getrandom"]
diff --git a/src/lib.rs b/src/lib.rs
index b4b1541..01369d0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,8 +53,7 @@
 //! First, Alice uses `EphemeralSecret::new()` and then
 //! `PublicKey::from()` to produce her secret and public keys:
 //!
-#![cfg_attr(feature = "docsrs", doc = "```")]
-#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
+//! ```rust
 //! use rand_core::OsRng;
 //! use x25519_dalek::{EphemeralSecret, PublicKey};
 //!
@@ -64,8 +63,7 @@
 //!
 //! Bob does the same:
 //!
-#![cfg_attr(feature = "docsrs", doc = "```")]
-#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
+//! ```rust
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! let bob_secret = EphemeralSecret::new(OsRng);
@@ -76,8 +74,7 @@
 //! loudly meows `bob_public` back to Alice.  Alice now computes her
 //! shared secret with Bob by doing:
 //!
-#![cfg_attr(feature = "docsrs", doc = "```")]
-#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
+//! ```rust
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! # let alice_secret = EphemeralSecret::new(OsRng);
@@ -89,8 +86,7 @@
 //!
 //! Similarly, Bob computes a shared secret by doing:
 //!
-#![cfg_attr(feature = "docsrs", doc = "```")]
-#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
+//! ```rust
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! # let alice_secret = EphemeralSecret::new(OsRng);
@@ -102,8 +98,7 @@
 //!
 //! These secrets are the same:
 //!
-#![cfg_attr(feature = "docsrs", doc = "```")]
-#![cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
+//! ```rust
 //! # use rand_core::OsRng;
 //! # use x25519_dalek::{EphemeralSecret, PublicKey};
 //! # let alice_secret = EphemeralSecret::new(OsRng);
diff --git a/src/x25519.rs b/src/x25519.rs
index 29c9c1a..5ee00f6 100644
--- a/src/x25519.rs
+++ b/src/x25519.rs
@@ -267,8 +267,7 @@ impl SharedSecret {
 /// cannot use the better, safer, and faster ephemeral DH API.
 ///
 /// # Example
-#[cfg_attr(feature = "docsrs", doc = "```")]
-#[cfg_attr(not(feature = "docsrs"), doc = "```ignore")]
+/// ```rust
 /// use rand_core::OsRng;
 /// use rand_core::RngCore;
 ///