Replace crates related to scrypt to other crates

Author: SeungMin Lee

Cargo.toml

@@ -7,7 +7,6 @@ edition = "2018"
 [dependencies]
 ring = "0.14.6"
 quick-error = "1.2"
-rust-crypto = "0.2.36"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }
 sha-1 = "0.8.2"
 sha2 = "0.8.1"
@@ -19,6 +18,7 @@ block-modes = "0.3.3"
 aes = "0.3.2"
 ctr = "0.3.2"
 hex = "0.4.0"
+scrypt = { version = "0.2", default-features = false }
 
 [dev-dependencies]
 rand = "0.6.1"

src/error.rs

@@ -42,11 +42,18 @@ quick_error! {
         InvalidP {
             display("Invalid p argument of the scrypt encryption")
         }
+        InvalidOutputLen {
+            display("Invalid length of output")
+        }
+        InvalidParams {
+            display("Invalid parameters")
+        }
     }
 }
 
 #[allow(deprecated)]
 mod errors {
+    use crate::error::ScryptError;
     use ring;
 
     quick_error! {
@@ -78,5 +85,17 @@ mod errors {
             SymmError(PrivSymmErr::RustCrypto(e))
         }
     }
+
+    impl From<scrypt::errors::InvalidOutputLen> for ScryptError {
+        fn from(_e: scrypt::errors::InvalidOutputLen) -> ScryptError {
+            ScryptError::InvalidOutputLen
+        }
+    }
+
+    impl From<scrypt::errors::InvalidParams> for ScryptError {
+        fn from(_e: scrypt::errors::InvalidParams) -> ScryptError {
+            ScryptError::InvalidParams
+        }
+    }
 }
 pub use self::errors::SymmError;

src/lib.rs

@@ -31,7 +31,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 
-extern crate crypto as rcrypto;
 extern crate primitives;
 #[macro_use]
 extern crate quick_error;

src/scrypt.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use rcrypto::scrypt::{scrypt, ScryptParams};
+use scrypt::{scrypt, ScryptParams};
 
 use crate::error::ScryptError;
 use crate::{Password, KEY_LENGTH, KEY_LENGTH_AES};
@@ -32,9 +32,43 @@ pub fn derive_key(pass: &Password, salt: &[u8; 32], n: u32, p: u32, r: u32) -> R
     }
 
     let mut derived_key = vec![0u8; KEY_LENGTH];
-    let scrypt_params = ScryptParams::new(log_n, r, p);
-    scrypt(pass.as_bytes(), salt, &scrypt_params, &mut derived_key);
+    let scrypt_params = ScryptParams::new(log_n, r, p)?;
+    scrypt(pass.as_bytes(), salt, &scrypt_params, &mut derived_key)?;
     let derived_right_bits = &derived_key[0..KEY_LENGTH_AES];
     let derived_left_bits = &derived_key[KEY_LENGTH_AES..KEY_LENGTH];
     Ok((derived_right_bits.to_vec(), derived_left_bits.to_vec()))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::password::Password;
+
+    #[test]
+    fn scrypt_test() {
+        let mut password = Password("rust-crypto-codechain");
+        let mut salt = [1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8];
+        let mut n: u32 = 8;
+        let mut p: u32 = 16;
+        let mut r: u32 = 8;
+
+        let mut result = derive_key(&password, &salt, n, p, r).unwrap();
+        let mut right_bits = [229, 222, 150, 129, 167, 152, 151, 149, 110, 135, 118, 252, 139, 12, 227, 29];
+        let mut left_bits = [111, 69, 216, 187, 101, 33, 114, 185, 126, 184, 57, 98, 243, 60, 174, 249];
+        assert_eq!(&result.0[..], right_bits);
+        assert_eq!(&result.1[..], left_bits);
+
+
+        password = Password("Codechain and Foundry");
+        salt = [0; 32];
+        n = 16;
+        p = 1;
+        r = 1;
+
+        result = derive_key(&password, &salt, n, p, r).unwrap();
+        right_bits = [144, 79, 151, 99, 185, 187, 191, 74, 135, 222, 178, 102, 32, 179, 194, 170];
+        left_bits = [179, 96, 63, 181, 115, 192, 159, 237, 20, 181, 18, 253, 164, 77, 199, 136];
+        assert_eq!(&result.0[..], right_bits);
+        assert_eq!(&result.1[..], left_bits);
+    }
+}