exclude password from hash used in client proof

diff --git a/srp/src/client.rs b/srp/src/client.rs
index eed115344dcaa7869c547c67c0bd115c60d17ce5..845c6f8fe7d4a214e4d3009150eb4984122a60d1 100644 (file)
--- a/srp/src/client.rs
+++ b/srp/src/client.rs
@@ -200,11 +200,15 @@ impl<'a, D: Digest> SrpClient<'a, D> {
         let identity_hash = Self::compute_identity_hash(username, password);
         let x = Self::compute_x(identity_hash.as_slice(), salt);
 
+        let mut d = D::new();
+        d.update(username);
+        let username_hash = d.finalize();
+
         let key = self.compute_premaster_secret(&b_pub, &k, &x, &a, &u);
 
         let m1 = compute_m1::<D>(
             self.params,
-            identity_hash.as_slice(),
+            username_hash.as_slice(),
             &a_pub.to_bytes_be(),
             &b_pub.to_bytes_be(),
             &key.to_bytes_be(),

diff --git a/srp/src/server.rs b/srp/src/server.rs
index e1eb331af3f55edef53a8f65b446dd8c912c23f9..08c047523d7a106c833fd1552895ff5f9fb0881b 100644 (file)
--- a/srp/src/server.rs
+++ b/srp/src/server.rs
@@ -145,13 +145,13 @@ impl<'a, D: Digest> SrpServer<'a, D> {
 
         let mut d = D::new();
         d.update(username);
-        let identity_hash = d.finalize();
+        let username_hash = d.finalize();
 
         let key = self.compute_premaster_secret(&a_pub, &v, &u, &b);
 
         let m1 = compute_m1::<D>(
             self.params,
-            identity_hash.as_slice(),
+            username_hash.as_slice(),
             &a_pub.to_bytes_be(),
             &b_pub.to_bytes_be(),
             &key.to_bytes_be(),