Changed scrypt kdf defaults to match current geth values (p=1, r=8)

ethereumjs · Oct 16, 2018 · c68286b · c68286b
1 parent a696227
commit c68286b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/dist/keythereum.js b/dist/keythereum.js
@@ -60,8 +60,8 @@ module.exports = {
       memory: 280000000,
       dklen: 32,
       n: 262144,
-      r: 1,
-      p: 8
+      r: 8,
+      p: 1
     }
   },
 

diff --git a/dist/keythereum.min.js b/dist/keythereum.min.js
diff --git a/index.js b/index.js
@@ -52,8 +52,8 @@ module.exports = {
       memory: 280000000,
       dklen: 32,
       n: 262144,
-      r: 1,
-      p: 8
+      r: 8,
+      p: 1
     }
   },
 

diff --git a/test/checkKeyObj.js b/test/checkKeyObj.js
@@ -84,26 +84,14 @@ module.exports = {
           keyObjectCrypto.kdfparams.n,
           t.expected.crypto.kdfparams.n
         );
-        assert.strictEqual(
-          keyObjectCrypto.kdfparams.n,
-          keythereum.constants.scrypt.n
-        );
         assert.strictEqual(
           keyObjectCrypto.kdfparams.r,
           t.expected.crypto.kdfparams.r
         );
-        assert.strictEqual(
-          keyObjectCrypto.kdfparams.r,
-          keythereum.constants.scrypt.r
-        );
         assert.strictEqual(
           keyObjectCrypto.kdfparams.p,
           t.expected.crypto.kdfparams.p
         );
-        assert.strictEqual(
-          keyObjectCrypto.kdfparams.p,
-          keythereum.constants.scrypt.p
-        );
       } else {
         assert.strictEqual(
           keyObjectCrypto.kdfparams.c,

diff --git a/test/keys.js b/test/keys.js
@@ -556,7 +556,7 @@ describe("Key derivation", function () {
       derivedKey = keythereum.deriveKey(
         t.input.password,
         t.input.salt,
-        { kdf: t.input.kdf }
+        { kdf: t.input.kdf, kdfparams: t.input.kdfparams }
       );
       if (derivedKey.error) return done(derivedKey);
       assert.strictEqual(derivedKey.toString("hex"), t.expected);
@@ -565,7 +565,7 @@ describe("Key derivation", function () {
       keythereum.deriveKey(
         t.input.password,
         t.input.salt,
-        { kdf: t.input.kdf },
+        { kdf: t.input.kdf, kdfparams: t.input.kdfparams },
         function (derivedKey) {
           if (derivedKey.error) return done(derivedKey);
           assert.strictEqual(derivedKey.toString("hex"), t.expected);
@@ -583,7 +583,7 @@ describe("Key derivation", function () {
       derivedKey = keythereum.deriveKey(
         t.input.password,
         t.input.salt,
-        { kdf: t.input.kdf }
+        { kdf: t.input.kdf, kdfparams: t.input.kdfparams }
       );
       if (derivedKey.error) return done(derivedKey);
       assert.strictEqual(derivedKey.toString("hex"), t.expected);
@@ -592,7 +592,7 @@ describe("Key derivation", function () {
       keythereum.deriveKey(
         t.input.password,
         t.input.salt,
-        { kdf: t.input.kdf },
+        { kdf: t.input.kdf, kdfparams: t.input.kdfparams },
         function (derivedKey) {
           if (derivedKey.error) return done(derivedKey);
           assert.strictEqual(derivedKey.toString("hex"), t.expected);
@@ -614,7 +614,8 @@ describe("Key derivation", function () {
     input: {
       password: "testpassword",
       salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19",
-      kdf: "scrypt"
+      kdf: "scrypt",
+      kdfparams: { p: 8, r: 1 }
     },
     expected: "fac192ceb5fd772906bea3e118a69e8bbb5cc24229e20d8766fd298291bba6bd"
   });
@@ -659,7 +660,7 @@ describe("Dump private key", function () {
         t.input.privateKey,
         t.input.salt,
         t.input.iv,
-        { kdf: t.input.kdf }
+        { kdf: t.input.kdf, kdfparams: t.input.kdfparams }
       );
       if (keyObject.error) return done(keyObject);
       checkKeyObj.structure(keythereum, keyObject);
@@ -671,7 +672,7 @@ describe("Dump private key", function () {
         t.input.privateKey,
         t.input.salt,
         t.input.iv,
-        { kdf: t.input.kdf },
+        { kdf: t.input.kdf, kdfparams: t.input.kdfparams },
         function (keyObj) {
           if (keyObj.error) return done(keyObj);
           checkKeyObj.structure(keythereum, keyObj);
@@ -718,7 +719,8 @@ describe("Dump private key", function () {
       privateKey: "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d",
       salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19",
       iv: "83dbcc02d8ccb40e466191a123791e0e",
-      kdf: "scrypt"
+      kdf: "scrypt",
+      kdfparams: { p: 8, r: 1 }
     },
     expected: {
       address: "008aeeda4d805471df9b2a5b0f38a0c3bcba786b",