update to hkdf-0.4

diff --git a/Cargo.toml b/Cargo.toml
index d50b06caf5d7af913aab45b9f6198b588489f286..3e760bdd626e70cee830ea50d832a8178e4d5074 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ travis-ci = { repository = "warner/spake2.rs" }
 curve25519-dalek = "0.15"
 rand = "0.4"
 sha2 = "0.7"
-hkdf = "0.3"
+hkdf = "0.4"
 num-bigint = "0.1"
 hex = "0.3"
 

diff --git a/src/spake2.rs b/src/spake2.rs
index 836340105dbae0cd41b78600186ba7203848b645..5fbbcd5d4b9d4e7f455c0ce73f82865eaae8d7ab 100644 (file)
--- a/src/spake2.rs
+++ b/src/spake2.rs
@@ -144,7 +144,7 @@ fn ed25519_hash_to_scalar(s: &[u8]) -> c2_Scalar {
     //  i = int(h, 16)
     //  i % q
 
-    let okm = Hkdf::<Sha256>::new(s, b"").derive(b"SPAKE2 pw", 32 + 16);
+    let okm = Hkdf::<Sha256>::extract(b"", s).expand(b"SPAKE2 pw", 32 + 16);
     //println!("expanded:   {}{}", "................................", okm.iter().to_hex()); // ok
 
     let mut reducible = [0u8; 64]; // little-endian