From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 20 Sep 2018 02:56:13 +0200
Subject: update packages

---
 node_modules/pbkdf2/index.js | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'node_modules/pbkdf2/index.js')

diff --git a/node_modules/pbkdf2/index.js b/node_modules/pbkdf2/index.js
index 205abf08f..fc2f8d96f 100644
--- a/node_modules/pbkdf2/index.js
+++ b/node_modules/pbkdf2/index.js
@@ -1,9 +1,31 @@
-var crypto = require('crypto')
+var checkParameters = require('./lib/precondition')
+var native = require('crypto')
+
+function nativePBKDF2 (password, salt, iterations, keylen, digest, callback) {
+  checkParameters(password, salt, iterations, keylen)
+
+  if (typeof digest === 'function') {
+    callback = digest
+    digest = 'sha1'
+  }
+  if (typeof callback !== 'function') throw new Error('No callback provided to pbkdf2')
+
+  return native.pbkdf2(password, salt, iterations, keylen, digest, callback)
+}
+
+function nativePBKDF2Sync (password, salt, iterations, keylen, digest) {
+  checkParameters(password, salt, iterations, keylen)
+  digest = digest || 'sha1'
+  return native.pbkdf2Sync(password, salt, iterations, keylen, digest)
+}
+
 /* istanbul ignore next */
-if (crypto && (!crypto.pbkdf2Sync || crypto.pbkdf2Sync.toString().indexOf('keylen, digest') === -1)) {
-  exports.pbkdf2 = require('./lib/async')
+if (!native.pbkdf2Sync || native.pbkdf2Sync.toString().indexOf('keylen, digest') === -1) {
   exports.pbkdf2Sync = require('./lib/sync')
+  exports.pbkdf2 = require('./lib/async')
+
+// native
 } else {
-  exports.pbkdf2Sync = crypto.pbkdf2Sync
-  exports.pbkdf2 = crypto.pbkdf2
+  exports.pbkdf2Sync = nativePBKDF2Sync
+  exports.pbkdf2 = nativePBKDF2
 }
-- 
cgit v1.2.3