[WIP] Bump digest, ed25519, signature, and sha2

Bumps the aforementioned dependencies to their latest (pre)releases

Author: tarcieri

Cargo.toml

@@ -9,6 +9,3 @@ resolver = "2"
 
 [profile.dev]
 opt-level = 2
-
-[patch.crates-io]
-ed25519 = { git = "https://github.com/RustCrypto/signatures.git" }

curve25519-dalek/Cargo.toml

@@ -30,7 +30,7 @@ rustdoc-args = [
 features = ["serde", "rand_core", "digest", "legacy_compatibility", "group-bits"]
 
 [dev-dependencies]
-sha2 = { version = "=0.11.0-pre.4", default-features = false }
+sha2 = { version = "0.11.0-rc.0", default-features = false }
 bincode = "1"
 criterion = { version = "0.5", features = ["html_reports"] }
 hex = "0.4.2"
@@ -50,7 +50,7 @@ cfg-if = "1"
 ff = { version = "0.13", default-features = false, optional = true }
 group = { version = "0.13", default-features = false, optional = true }
 rand_core = { version = "0.6.4", default-features = false, optional = true }
-digest = { version = "=0.11.0-pre.9", default-features = false, optional = true }
+digest = { version = "0.11.0-rc.0", default-features = false, optional = true }
 subtle = { version = "2.6.0", default-features = false, features = ["const-generics"] }
 serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] }
 zeroize = { version = "1", default-features = false, optional = true }

ed25519-dalek/Cargo.toml

@@ -27,9 +27,9 @@ features = ["batch", "digest", "hazmat", "pem", "serde"]
 
 [dependencies]
 curve25519-dalek = { version = "4", path = "../curve25519-dalek", default-features = false, features = ["digest"] }
-ed25519 = { version = "=2.3.0-pre.0", default-features = false }
-signature = { version = "=2.3.0-pre.4", optional = true, default-features = false }
-sha2 = { version = "=0.11.0-pre.4", default-features = false }
+ed25519 = { version = "=3.0.0-pre.0", default-features = false }
+signature = { version = "3.0.0-rc.0", optional = true, default-features = false }
+sha2 = { version = "0.11.0-rc.0", default-features = false }
 subtle = { version = "2.3.0", default-features = false }
 
 # optional features
@@ -41,8 +41,8 @@ zeroize = { version = "1.5", default-features = false, optional = true }
 [dev-dependencies]
 curve25519-dalek = { version = "4", path = "../curve25519-dalek", default-features = false, features = ["digest", "rand_core"] }
 x25519-dalek = { version = "2", path = "../x25519-dalek", default-features = false, features = ["static_secrets"] }
-blake2 = "=0.11.0-pre.4"
-sha3 = "=0.11.0-pre.4"
+blake2 = "0.11.0-rc.0"
+sha3 = "0.11.0-rc.0"
 hex = "0.4"
 bincode = "1.0"
 serde_json = "1.0"
@@ -60,8 +60,8 @@ required-features = ["rand_core"]
 
 [features]
 default = ["fast", "std", "zeroize"]
-alloc = ["curve25519-dalek/alloc", "ed25519/alloc", "serde?/alloc", "zeroize/alloc"]
-std = ["alloc", "ed25519/std", "serde?/std", "sha2/std"]
+alloc = ["curve25519-dalek/alloc", "ed25519/alloc", "serde?/alloc", "signature/alloc", "zeroize/alloc"]
+std = ["alloc", "ed25519/std", "serde?/std"]
 
 batch = ["alloc", "merlin", "rand_core"]
 fast = ["curve25519-dalek/precomputed-tables"]

ed25519-dalek/src/errors.rs

@@ -107,12 +107,12 @@ impl Error for InternalError {}
 pub type SignatureError = ed25519::signature::Error;
 
 impl From<InternalError> for SignatureError {
-    #[cfg(not(feature = "std"))]
+    #[cfg(not(feature = "alloc"))]
     fn from(_err: InternalError) -> SignatureError {
         SignatureError::new()
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(feature = "alloc")]
     fn from(err: InternalError) -> SignatureError {
         SignatureError::from_source(err)
     }