aboutsummaryrefslogtreecommitdiff
path: root/test/parallel/test-crypto.js
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2017-09-09 18:41:56 -0400
committerRuben Bridgewater <ruben@bridgewater.de>2017-09-11 00:18:02 -0300
commit6ebdb69472beaabe4d3aac7f66e1f83b196278af (patch)
treeb1704c5fc47200c27b322e5ab9d34a557b94aee9 /test/parallel/test-crypto.js
parentfc1fa4e2c49aa060b97b139ff02b5be8037dba94 (diff)
downloadandroid-node-v8-6ebdb69472beaabe4d3aac7f66e1f83b196278af.tar.gz
android-node-v8-6ebdb69472beaabe4d3aac7f66e1f83b196278af.tar.bz2
android-node-v8-6ebdb69472beaabe4d3aac7f66e1f83b196278af.zip
crypto: fix Node_SignFinal
PR #11705 switched Node away from using using OpenSSL's legacy EVP_Sign* and EVP_Verify* APIs. Instead, it computes a hash normally via EVP_Digest* and then uses EVP_PKEY_sign and EVP_PKEY_verify to verify the hash directly. This change corrects two problems: 1. The documentation still recommends the signature algorithm EVP_MD names of OpenSSL's legacy APIs. OpenSSL has since moved away from thosee, which is why ECDSA was strangely inconsistent. (This is why "ecdsa-with-SHA256" was missing.) 2. Node_SignFinal copied some code from EVP_SignFinal's internals. This is problematic for OpenSSL 1.1.0 and is missing a critical check that prevents pkey->pkey.ptr from being cast to the wrong type. To resolve this, remove the non-EVP_PKEY_sign codepath. This codepath is no longer necessary. PR #11705's verify half was already assuming all EVP_PKEYs supported EVP_PKEY_sign and EVP_PKEY_verify. Also, in the documentation, point users towards using hash function names which are more consisent. This avoids an ECDSA special-case and some strangeness around RSA-PSS ("RSA-SHA256" is the OpenSSL name of the sha256WithRSAEncryption OID which is not used for RSA-PSS). PR-URL: https://github.com/nodejs/node/pull/15024 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'test/parallel/test-crypto.js')
-rw-r--r--test/parallel/test-crypto.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
index 130e005aaa..6262e08384 100644
--- a/test/parallel/test-crypto.js
+++ b/test/parallel/test-crypto.js
@@ -146,11 +146,11 @@ assert.throws(function() {
}, /^TypeError: Bad input string$/);
assert.throws(function() {
- crypto.createSign('RSA-SHA1').update('0', 'hex');
+ crypto.createSign('SHA1').update('0', 'hex');
}, /^TypeError: Bad input string$/);
assert.throws(function() {
- crypto.createVerify('RSA-SHA1').update('0', 'hex');
+ crypto.createVerify('SHA1').update('0', 'hex');
}, /^TypeError: Bad input string$/);
assert.throws(function() {
@@ -163,7 +163,7 @@ assert.throws(function() {
'-----END RSA PRIVATE KEY-----',
''
].join('\n');
- crypto.createSign('RSA-SHA256').update('test').sign(priv);
+ crypto.createSign('SHA256').update('test').sign(priv);
}, /digest too big for rsa key$/);
assert.throws(function() {