update SRP dependencies

diff --git a/srp/Cargo.toml b/srp/Cargo.toml
index 891631762940ed3a573e292167c6f6cf27dce078..ced32e752337fd9f71dd965ccd4489dc2ab5faeb 100644 (file)
--- a/srp/Cargo.toml
+++ b/srp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "srp"
-version = "0.2.5"
+version = "0.3.0"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Secure Remote Password (SRP) protocol implementation"
@@ -10,15 +10,15 @@ keywords = ["crypto", "pake", "authentication"]
 categories = ["cryptography", "authentication"]
 
 [dependencies]
-num = "0.1"
-generic-array = "0.8"
-digest = "0.6"
+num = "0.2"
+generic-array = "0.12"
+digest = "0.8"
 lazy_static = "0.2"
 
 [dev-dependencies]
-rand = "0.3"
-sha2 = "0.6"
-sha-1 = "0.4"
+rand = "0.5"
+sha2 = "0.8"
+sha-1 = "0.8"
 
 [badges]
 travis-ci = { repository = "RustCrypto/PAKEs" }

diff --git a/srp/src/client.rs b/srp/src/client.rs
index ed4a2f606269fe38929be9c07b435c1cbaebf0c9..8d10b84b1009bfa35b0e21f78f86b76547546fed 100644 (file)
--- a/srp/src/client.rs
+++ b/srp/src/client.rs
@@ -8,7 +8,8 @@
 //! use srp::groups::G_2048;
 //! use sha2::Sha256;
 //!
-//! let a = rng.gen_iter::<u8>().take(64).collect::<Vec<u8>>();
+//! let mut a = [0u8; 64];
+//! rng.fill_bytes(&mut a);
 //! let client = SrpClient::<Sha256>::new(&a, &G_2048);
 //! ```
 //!
@@ -55,8 +56,6 @@
 //! let pwd_verifier = client.get_password_verifier(&private_key);
 //! conn.send_registration_data(username, salt, pwd_verifier);
 //! ```
-
-//let buf = rng.gen_iter::<u8>().take(l).collect::<Vec<u8>>();
 use std::marker::PhantomData;
 
 use digest::Digest;

diff --git a/srp/src/lib.rs b/srp/src/lib.rs
index 3645a6f3a3cfc981e1e04ebad3b4a8905412965d..1467496dbb8ce98f08f5ad19b13b6e8515c68a65 100644 (file)
--- a/srp/src/lib.rs
+++ b/srp/src/lib.rs
@@ -71,7 +71,7 @@ extern crate num;
 extern crate lazy_static;
 
 #[cfg(test)]
-extern crate sha_1;
+extern crate sha1;
 
 pub mod client;
 pub mod groups;

diff --git a/srp/src/server.rs b/srp/src/server.rs
index a5d49ab56ba310741bc68abaca9b4df63dddb923..52e9c38ed4a6b3c704795ec5f34f7705b08985bb 100644 (file)
--- a/srp/src/server.rs
+++ b/srp/src/server.rs
@@ -10,7 +10,8 @@
 //!
 //! let (username, a_pub) = conn.receive_handshake();
 //! let user = db.retrieve_user_record(username);
-//! let b = rng.gen_iter::<u8>().take(64).collect::<Vec<u8>>();
+//! let b = [0u8; 64];
+//! rng.fill_bytes(&mut b);
 //! let server = SrpServer::<Sha256>::new(&user, &a_pub, &b, &G_2048)?;
 //! ```
 //!

diff --git a/srp/src/types.rs b/srp/src/types.rs
index e8024fc4d84cb3fd874e8cd97dd7a0598969f3b7..e2048a3575f6bcf74767abb48bb4cac0e6b1ddf3 100644 (file)
--- a/srp/src/types.rs
+++ b/srp/src/types.rs
@@ -54,7 +54,7 @@ impl SrpGroup {
 #[cfg(test)]
 mod tests {
     use groups::G_1024;
-    use sha_1::Sha1;
+    use sha1::Sha1;
 
     #[test]
     fn test_k_1024_sha1() {

diff --git a/srp/tests/mod.rs b/srp/tests/mod.rs
index d7354803140e514f1ce0d3a2eededfb1d5c98f5c..40ba5c6f096a80dfd624b29847181200062bbef6 100644 (file)
--- a/srp/tests/mod.rs
+++ b/srp/tests/mod.rs
@@ -3,7 +3,7 @@ extern crate rand;
 extern crate sha2;
 extern crate srp;
 
-use rand::Rng;
+use rand::RngCore;
 use sha2::Sha256;
 
 use srp::client::{srp_private_key, SrpClient};
@@ -15,11 +15,13 @@ fn auth_test(reg_pwd: &[u8], auth_pwd: &[u8]) {
     let username = b"alice";
 
     // Client instance creation
-    let a = rng.gen_iter::<u8>().take(64).collect::<Vec<u8>>();
+    let mut a = [0u8; 64];
+    rng.fill_bytes(&mut a);
     let client = SrpClient::<Sha256>::new(&a, &G_2048);
 
     // Registration
-    let salt: [u8; 16] = rng.gen();
+    let mut salt = [0u8; 16];
+    rng.fill_bytes(&mut salt);
     let reg_priv_key = srp_private_key::<Sha256>(username, reg_pwd, &salt);
     let verif = client.get_password_verifier(&reg_priv_key);
 
@@ -32,7 +34,8 @@ fn auth_test(reg_pwd: &[u8], auth_pwd: &[u8]) {
         salt: &salt,
         verifier: &verif,
     };
-    let b = rng.gen_iter::<u8>().take(64).collect::<Vec<u8>>();
+    let mut b = [0u8; 64];
+    rng.fill_bytes(&mut b);
     let server = SrpServer::<Sha256>::new(&user, &a_pub, &b, &G_2048).unwrap();
     let (salt, b_pub) = (&user.salt, server.get_b_pub());