From: Brian Warner <warner@lothar.com>
Date: Wed, 7 Aug 2019 00:41:46 +0000 (-0700)
Subject: update spake2 to current hkdf-0.8
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=695c070db2c46ab75ec908dcc7baebb79c60596c;p=PAKEs.git

update spake2 to current hkdf-0.8
---

diff --git a/spake2/Cargo.toml b/spake2/Cargo.toml
index 953d2b8..a0ed4f8 100644
--- a/spake2/Cargo.toml
+++ b/spake2/Cargo.toml
@@ -29,7 +29,7 @@ is-it-maintained-open-issues = { repository = "RustCrypto/PAKEs" }
 curve25519-dalek = "1"
 rand = "0.6"
 sha2 = "0.8"
-hkdf = "0.7"
+hkdf = "0.8"
 hex = "0.3"
 
 [dev-dependencies]
diff --git a/spake2/src/lib.rs b/spake2/src/lib.rs
index ea488ba..80480f3 100644
--- a/spake2/src/lib.rs
+++ b/spake2/src/lib.rs
@@ -470,7 +470,7 @@ fn ed25519_hash_to_scalar(s: &[u8]) -> c2_Scalar {
     //  i % q
 
     let mut okm = [0u8; 32 + 16];
-    Hkdf::<Sha256>::extract(Some(b""), s)
+    Hkdf::<Sha256>::new(Some(b""), s)
         .expand(b"SPAKE2 pw", &mut okm)
         .unwrap();
     //println!("expanded:   {}{}", "................................", okm.iter().to_hex()); // ok