etherscan-io
diff --git a/‎lib/elliptic.js
Lines changed: 0 additions & 1 deletion b/‎lib/elliptic.js
Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/elliptic/ec/index.js
Lines changed: 6 additions & 3 deletions b/‎lib/elliptic/ec/index.js
Lines changed: 6 additions & 3 deletions
diff --git a/‎lib/elliptic/hmac-drbg.js
Lines changed: 0 additions & 114 deletions b/‎lib/elliptic/hmac-drbg.js
Lines changed: 0 additions & 114 deletions
diff --git a/‎lib/elliptic/utils.js
Lines changed: 8 additions & 60 deletions b/‎lib/elliptic/utils.js
Lines changed: 8 additions & 60 deletions
diff --git a/‎package.json
Lines changed: 4 additions & 1 deletion b/‎package.json
Lines changed: 4 additions & 1 deletion
@@ -5,7 +5,6 @@ var elliptic = exports;
 elliptic.version = require('../package.json').version;
 elliptic.utils = require('./elliptic/utils');
 elliptic.rand = require('brorand');
-elliptic.hmacDRBG = require('./elliptic/hmac-drbg');
 elliptic.curve = require('./elliptic/curve');
 elliptic.curves = require('./elliptic/curves');
 
 
@@ -1,6 +1,7 @@
 'use strict';
 
 var BN = require('bn.js');
+var HmacDRBG = require('hmac-drbg');
 var elliptic = require('../../elliptic');
 var utils = elliptic.utils;
 var assert = utils.assert;
@@ -54,10 +55,12 @@ EC.prototype.genKeyPair = function genKeyPair(options) {
     options = {};
 
   // Instantiate Hmac_DRBG
-  var drbg = new elliptic.hmacDRBG({
+  var drbg = new HmacDRBG({
     hash: this.hash,
     pers: options.pers,
+    persEnc: options.persEnc || 'utf8',
     entropy: options.entropy || elliptic.rand(this.hash.hmacStrength),
+    entropyEnc: options.entropy && options.entropyEnc || 'utf8',
     nonce: this.n.toArray()
   });
 
@@ -102,12 +105,12 @@ EC.prototype.sign = function sign(msg, key, enc, options) {
   var nonce = msg.toArray('be', bytes);
 
   // Instantiate Hmac_DRBG
-  var drbg = new elliptic.hmacDRBG({
+  var drbg = new HmacDRBG({
     hash: this.hash,
     entropy: bkey,
     nonce: nonce,
     pers: options.pers,
-    persEnc: options.persEnc
+    persEnc: options.persEnc || 'utf8'
   });
 
   // Number of bytes to generate
 
@@ -2,66 +2,14 @@
 
 var utils = exports;
 var BN = require('bn.js');
-
-utils.assert = function assert(val, msg) {
-  if (!val)
-    throw new Error(msg || 'Assertion failed');
-};
-
-function toArray(msg, enc) {
-  if (Array.isArray(msg))
-    return msg.slice();
-  if (!msg)
-    return [];
-  var res = [];
-  if (typeof msg !== 'string') {
-    for (var i = 0; i < msg.length; i++)
-      res[i] = msg[i] | 0;
-    return res;
-  }
-  if (!enc) {
-    for (var i = 0; i < msg.length; i++) {
-      var c = msg.charCodeAt(i);
-      var hi = c >> 8;
-      var lo = c & 0xff;
-      if (hi)
-        res.push(hi, lo);
-      else
-        res.push(lo);
-    }
-  } else if (enc === 'hex') {
-    msg = msg.replace(/[^a-z0-9]+/ig, '');
-    if (msg.length % 2 !== 0)
-      msg = '0' + msg;
-    for (var i = 0; i < msg.length; i += 2)
-      res.push(parseInt(msg[i] + msg[i + 1], 16));
-  }
-  return res;
-}
-utils.toArray = toArray;
-
-function zero2(word) {
-  if (word.length === 1)
-    return '0' + word;
-  else
-    return word;
-}
-utils.zero2 = zero2;
-
-function toHex(msg) {
-  var res = '';
-  for (var i = 0; i < msg.length; i++)
-    res += zero2(msg[i].toString(16));
-  return res;
-}
-utils.toHex = toHex;
-
-utils.encode = function encode(arr, enc) {
-  if (enc === 'hex')
-    return toHex(arr);
-  else
-    return arr;
-};
+var minAssert = require('minimalistic-assert');
+var minUtils = require('minimalistic-crypto-utils');
+
+utils.assert = minAssert;
+utils.toArray = minUtils.toArray;
+utils.zero2 = minUtils.zero2;
+utils.toHex = minUtils.toHex;
+utils.encode = minUtils.encode;
 
 // Represent num in a w-NAF form
 function getNAF(num, w) {
 
@@ -50,6 +50,9 @@
     "bn.js": "^4.4.0",
     "brorand": "^1.0.1",
     "hash.js": "^1.0.0",
-    "inherits": "^2.0.1"
+    "hmac-drbg": "^1.0.0",
+    "inherits": "^2.0.1",
+    "minimalistic-assert": "^1.0.0",
+    "minimalistic-crypto-utils": "^1.0.0"
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@`
`50`	`50`	`"bn.js": "^4.4.0",`
`51`	`51`	`"brorand": "^1.0.1",`
`52`	`52`	`"hash.js": "^1.0.0",`
`53`		`- "inherits": "^2.0.1"`
	`53`	`+ "hmac-drbg": "^1.0.0",`
	`54`	`+ "inherits": "^2.0.1",`
	`55`	`+ "minimalistic-assert": "^1.0.0",`
	`56`	`+ "minimalistic-crypto-utils": "^1.0.0"`
`54`	`57`	`}`
`55`	`58`	`}`