diff options
Diffstat (limited to 'lib/crypto.js')
-rw-r--r-- | lib/crypto.js | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/crypto.js b/lib/crypto.js index 2d4695dc97..da381463fd 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -537,11 +537,6 @@ ECDH.prototype.getPublicKey = function getPublicKey(encoding, format) { }; -const pbkdf2DeprecationWarning = - internalUtil.deprecate(() => {}, 'crypto.pbkdf2 without specifying' + - ' a digest is deprecated. Please specify a digest', 'DEP0009'); - - exports.pbkdf2 = function(password, salt, iterations, @@ -551,7 +546,6 @@ exports.pbkdf2 = function(password, if (typeof digest === 'function') { callback = digest; digest = undefined; - pbkdf2DeprecationWarning(); } if (typeof callback !== 'function') @@ -562,15 +556,17 @@ exports.pbkdf2 = function(password, exports.pbkdf2Sync = function(password, salt, iterations, keylen, digest) { - if (typeof digest === 'undefined') { - digest = undefined; - pbkdf2DeprecationWarning(); - } return pbkdf2(password, salt, iterations, keylen, digest); }; function pbkdf2(password, salt, iterations, keylen, digest, callback) { + + if (digest === undefined) { + throw new TypeError( + 'The "digest" argument is required and must not be undefined'); + } + password = toBuf(password); salt = toBuf(salt); |