From 04c8574106fd954bfa5faf5c22bb40a9357eb59c Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Sat, 20 Jan 2018 02:36:42 +0000
Subject: [PATCH] Bump versions for several dependencies.

---
 Cargo.toml     | 12 ++++++------
 src/ed25519.rs | 10 +++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 103cb9a..ad944c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,30 +16,30 @@ exclude = [ ".gitignore", "TESTVECTORS", "res/*" ]
 travis-ci = { repository = "isislovecruft/ed25519-dalek", branch = "master"}
 
 [dependencies.curve25519-dalek]
-version = "^0.14"
+version = "0.14"
 default-features = false
 
 [dependencies.subtle]
-version = "^0.3"
+version = "0.5"
 default-features = false
 
 [dependencies.rand]
 optional = true
-version = "^0.3"
+version = "0.4"
 
 [dependencies.digest]
-version = "^0.6"
+version = "0.6"
 
 [dependencies.generic-array]
 # same version that digest depends on
-version = "^0.8"
+version = "0.9"
 
 [dependencies.serde]
 version = "^1.0"
 optional = true
 
 [dependencies.sha2]
-version = "^0.6"
+version = "0.7"
 optional = true
 
 [dependencies.failure]
diff --git a/src/ed25519.rs b/src/ed25519.rs
index 15b6c4b..b3b2f2b 100644
--- a/src/ed25519.rs
+++ b/src/ed25519.rs
@@ -27,10 +27,7 @@ use serde::de::Visitor;
 #[cfg(feature = "sha2")]
 use sha2::Sha512;
 
-use digest::BlockInput;
 use digest::Digest;
-use digest::Input;
-use digest::FixedOutput;
 
 use generic_array::typenum::U64;
 
@@ -539,7 +536,6 @@ impl ExpandedSecretKey {
     /// ```
     pub fn from_secret_key<D>(secret_key: &SecretKey) -> ExpandedSecretKey
             where D: Digest<OutputSize = U64> + Default {
-
         let mut h: D = D::default();
         let mut hash:  [u8; 64] = [0u8; 64];
         let mut lower: [u8; 32] = [0u8; 32];
@@ -561,7 +557,6 @@ impl ExpandedSecretKey {
     /// Sign a message with this `ExpandedSecretKey`.
     pub fn sign<D>(&self, message: &[u8], public_key: &PublicKey) -> Signature
             where D: Digest<OutputSize = U64> + Default {
-
         let mut h: D = D::default();
         let mut hash: [u8; 64] = [0u8; 64];
         let mesg_digest: Scalar;
@@ -887,13 +882,14 @@ impl Keypair {
     }
 
     /// Sign a message with this keypair's secret key.
-    pub fn sign<D>(&self, message: &[u8]) -> Signature where D: Digest<OutputSize = U64> + Default {
+    pub fn sign<D>(&self, message: &[u8]) -> Signature
+            where D: Digest<OutputSize = U64> + Default {
         self.secret.expand::<D>().sign::<D>(&message, &self.public)
     }
 
     /// Verify a signature on a message with this keypair's public key.
     pub fn verify<D>(&self, message: &[u8], signature: &Signature) -> bool
-            where D: FixedOutput<OutputSize = U64> + BlockInput + Default + Input {
+            where D: Digest<OutputSize = U64> + Default {
         self.public.verify::<D>(message, signature)
     }
 }