diff options
author | James M Snell <jasnell@gmail.com> | 2017-02-10 14:48:39 -0800 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-02-13 11:04:51 -0800 |
commit | 9f74184e98020eb71060ee38c2b3d649ad299bb6 (patch) | |
tree | 0773ea44b6a252d1e24984e2c0dd124e3d808e75 /test | |
parent | 8bcc1223496e6ae16e2b3b2afddf9ca792625055 (diff) | |
download | android-node-v8-9f74184e98020eb71060ee38c2b3d649ad299bb6.tar.gz android-node-v8-9f74184e98020eb71060ee38c2b3d649ad299bb6.tar.bz2 android-node-v8-9f74184e98020eb71060ee38c2b3d649ad299bb6.zip |
crypto: upgrade pbkdf2 without digest to an error
Commit a1163582 added a deprecation warning when pbkdf2 was called without an
explicit `digest` argument. This was because the default digest is `sha1`,
which is not-recommended from a security point of view. This upgrades it
to a runtime error when `digest` is undefined per the plan discussed in
the original issue.
Ref: https://github.com/nodejs/node/commit/a1163582c53dc6e00f3680084269600913b1cad2
PR-URL: https://github.com/nodejs/node/pull/11305
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/parallel/test-crypto-domains.js | 2 | ||||
-rw-r--r-- | test/parallel/test-crypto-pbkdf2.js | 8 | ||||
-rw-r--r-- | test/parallel/test-domain-crypto.js | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/test/parallel/test-crypto-domains.js b/test/parallel/test-crypto-domains.js index d0dcf7f210..f142fd09a5 100644 --- a/test/parallel/test-crypto-domains.js +++ b/test/parallel/test-crypto-domains.js @@ -19,7 +19,7 @@ d.run(function() { one(); function one() { - crypto.pbkdf2('a', 'b', 1, 8, function() { + crypto.pbkdf2('a', 'b', 1, 8, 'sha1', function() { two(); throw new Error('pbkdf2'); }); diff --git a/test/parallel/test-crypto-pbkdf2.js b/test/parallel/test-crypto-pbkdf2.js index 8b22b9f3fe..63152abfa4 100644 --- a/test/parallel/test-crypto-pbkdf2.js +++ b/test/parallel/test-crypto-pbkdf2.js @@ -96,3 +96,11 @@ assert.doesNotThrow(() => { assert.ifError(e); })); }); + +assert.throws(() => { + crypto.pbkdf2('password', 'salt', 8, 8, function() {}); +}, /^TypeError: The "digest" argument is required and must not be undefined$/); + +assert.throws(() => { + crypto.pbkdf2Sync('password', 'salt', 8, 8); +}, /^TypeError: The "digest" argument is required and must not be undefined$/); diff --git a/test/parallel/test-domain-crypto.js b/test/parallel/test-domain-crypto.js index 8293eb82d2..e212bc8d56 100644 --- a/test/parallel/test-domain-crypto.js +++ b/test/parallel/test-domain-crypto.js @@ -19,4 +19,4 @@ crypto.randomBytes(8); crypto.randomBytes(8, function() {}); crypto.pseudoRandomBytes(8); crypto.pseudoRandomBytes(8, function() {}); -crypto.pbkdf2('password', 'salt', 8, 8, function() {}); +crypto.pbkdf2('password', 'salt', 8, 8, 'sha1', function() {}); |