Merge pull request #81 from ethereumjs/upgrade-crypto-deps

Upgrade crypto deps

Author: tinybike

.travis.yml

@@ -4,27 +4,16 @@ branches:
   only:
     - master
 
-env:
-  - CXX=g++-4.8
-
 node_js:
+  - "14"
+  - "13"
+  - "12"
+  - "10"
   - "8"
-  - "7"
-  - "6"
-  - "5"
-  - "4"
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - gcc-4.8
-    - g++-4.8
 
 before_script:
   - npm install
 
 script:
   - npm run lint
-  - istanbul cover -x **/lib/** ./node_modules/mocha/bin/_mocha test/keys.js --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
+  - istanbul cover ./node_modules/mocha/bin/_mocha test/keys.js --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage

index.js

@@ -11,6 +11,7 @@ var sjcl = require("sjcl");
 var uuid = require("uuid");
 var secp256k1 = require("secp256k1/elliptic");
 var createKeccakHash = require("keccak/js");
+var scrypt = require("scrypt-js");
 
 function isFunction(f) {
   return typeof f === "function";
@@ -152,7 +153,9 @@ module.exports = {
         privateKeyBuffer
       ]);
     }
-    publicKey = secp256k1.publicKeyCreate(privateKeyBuffer, false).slice(1);
+    publicKey = Buffer.from(
+      secp256k1.publicKeyCreate(privateKeyBuffer, false).slice(1)
+    );
     return "0x" + keccak256(publicKey).slice(-20).toString("hex");
   },
 
@@ -177,44 +180,21 @@ module.exports = {
   /**
    * Used internally.
    */
-  deriveKeyUsingScryptInNode: function (password, salt, options, cb) {
-    if (!isFunction(cb)) return this.deriveKeyUsingScryptInBrowser(password, salt, options);
-    require("scrypt").hash(password, {
-      N: options.kdfparams.n || this.constants.scrypt.n,
-      r: options.kdfparams.r || this.constants.scrypt.r,
-      p: options.kdfparams.p || this.constants.scrypt.p
-    }, options.kdfparams.dklen || this.constants.scrypt.dklen, salt).then(cb).catch(cb);
-  },
-
-  /**
-   * Used internally.
-   */
-  deriveKeyUsingScryptInBrowser: function (password, salt, options, cb) {
-    var self = this;
-    if (this.scrypt === null) this.scrypt = require("./lib/scrypt");
-    if (isFunction(this.scrypt)) {
-      this.scrypt = this.scrypt(options.kdfparams.memory || this.constants.scrypt.memory);
-    }
-    if (!isFunction(cb)) {
-      return Buffer.from(this.scrypt.to_hex(this.scrypt.crypto_scrypt(
-        password,
-        salt,
-        options.kdfparams.n || this.constants.scrypt.n,
-        options.kdfparams.r || this.constants.scrypt.r,
-        options.kdfparams.p || this.constants.scrypt.p,
-        options.kdfparams.dklen || this.constants.scrypt.dklen
-      )), "hex");
+  deriveKeyUsingScrypt: function (password, salt, options, cb) {
+    var n = options.kdfparams.n || this.constants.scrypt.n;
+    var r = options.kdfparams.r || this.constants.scrypt.r;
+    var p = options.kdfparams.p || this.constants.scrypt.p;
+    var dklen = options.kdfparams.dklen || this.constants.scrypt.dklen;
+    if (isFunction(cb)) {
+      scrypt
+        .scrypt(password, salt, n, r, p, dklen)
+        .then(function (key) {
+          cb(Buffer.from(key));
+        })
+        .catch(cb);
+    } else {
+      return Buffer.from(scrypt.syncScrypt(password, salt, n, r, p, dklen));
     }
-    setTimeout(function () {
-      cb(Buffer.from(self.scrypt.to_hex(self.scrypt.crypto_scrypt(
-        password,
-        salt,
-        options.kdfparams.n || self.constants.scrypt.n,
-        options.kdfparams.r || self.constants.scrypt.r,
-        options.kdfparams.p || self.constants.scrypt.p,
-        options.kdfparams.dklen || self.constants.scrypt.dklen
-      )), "hex"));
-    }, 0);
   },
 
   /**
@@ -242,8 +222,7 @@ module.exports = {
 
     // use scrypt as key derivation function
     if (options.kdf === "scrypt") {
-      if (!this.browser) return this.deriveKeyUsingScryptInNode(password, salt, options, cb);
-      return this.deriveKeyUsingScryptInBrowser(password, salt, options, cb);
+      return this.deriveKeyUsingScrypt(password, salt, options, cb);
     }
 
     // use default key derivation function (PBKDF2)