openpgp: Upgrade ed25519

2 files changed, 7 insertions, 22 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 31d26f7a..b9ba7f77 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -818,7 +818,7 @@ dependencies = [
  "pkcs8",
  "rfc6979",
  "sha2",
- "signature 2.0.0",
+ "signature",
  "zeroize",
 ]
 
@@ -860,27 +860,18 @@ dependencies = [
  "digest",
  "elliptic-curve",
  "rfc6979",
- "signature 2.0.0",
+ "signature",
  "spki",
 ]
 
 [[package]]
 name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "signature 1.6.4",
-]
-
-[[package]]
-name = "ed25519"
 version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
- "signature 2.0.0",
+ "signature",
 ]
 
 [[package]]
@@ -890,7 +881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
  "curve25519-dalek",
- "ed25519 2.2.3",
+ "ed25519",
  "rand_core",
  "serde",
  "sha2",
@@ -2369,7 +2360,7 @@ dependencies = [
  "pkcs1",
  "pkcs8",
  "rand_core",
- "signature 2.0.0",
+ "signature",
  "spki",
  "subtle",
  "zeroize",
@@ -2583,7 +2574,7 @@ dependencies = [
  "eax",
  "ecb",
  "ecdsa",
- "ed25519 1.5.3",
+ "ed25519",
  "ed25519-dalek",
  "flate2",
  "generic-array",
@@ -2694,12 +2685,6 @@ checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
 
 [[package]]
 name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
-[[package]]
-name = "signature"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index 889d7bd1..50d450de 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -76,7 +76,7 @@ ecdsa = { version = "0.16", optional = true, features = ["hazmat", "arithmetic"]
 # We don't directly use ed25519, but ed25519-dalek reexports it and we
 # need the std feature, at least so that ed25519::Error implements
 # std::error::Error.
-ed25519 = { version = "1", default-features = false, features = ["std"], optional = true }
+ed25519 = { version = "2", default-features = false, features = ["std"], optional = true }
 ed25519-dalek = { version = "2", features = ["rand_core", "zeroize"], optional = true }
 generic-array = { version = "0.14.4", optional = true }
 idea = { version = "0.5", optional = true, features = ["zeroize"] }