1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: throw proper errors if out enc is UTF-16

Browse Source 
Throw `Error`s instead of hard crashing when the `.digest()` output
encoding is UTF-16.

Fixes: https://github.com/nodejs/node/issues/9817
PR-URL: https://github.com/nodejs/node/pull/12752
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
This commit is contained in:
Anna Henningsen 2017-04-30 00:48:46 +02:00
parent 9990be2919
commit 6c2daf0ce9
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/node_crypto.cc
View File

@ -3798,6 +3798,10 @@ void Hmac::HmacDigest(const FunctionCallbackInfo<Value>& args) {
encoding = ParseEncoding(env->isolate(), args[0], BUFFER); encoding = ParseEncoding(env->isolate(), args[0], BUFFER);
} }
if (encoding == UCS2) {
return env->ThrowError("hmac.digest() does not support UTF-16");
}
unsigned char* md_value = nullptr; unsigned char* md_value = nullptr;
unsigned int md_len = 0; unsigned int md_len = 0;
@ -3921,6 +3925,10 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
encoding = ParseEncoding(env->isolate(), args[0], BUFFER); encoding = ParseEncoding(env->isolate(), args[0], BUFFER);
} }
if (encoding == UCS2) {
return env->ThrowError("hash.digest() does not support UTF-16");
}
unsigned char md_value[EVP_MAX_MD_SIZE]; unsigned char md_value[EVP_MAX_MD_SIZE];
unsigned int md_len; unsigned int md_len;

10
test/parallel/test-crypto-hash.js
View File

@ -108,10 +108,12 @@ const h3 = crypto.createHash('sha256');
h3.digest(); h3.digest();
assert.throws(function() { assert.throws(function() {
h3.digest(); h3.digest();
}, }, /Digest already called/);
/Digest already called/);
assert.throws(function() { assert.throws(function() {
h3.update('foo'); h3.update('foo');
}, }, /Digest already called/);
/Digest already called/);
assert.throws(function() {
crypto.createHash('sha256').digest('ucs2');
}, /^Error: hash\.digest\(\) does not support UTF-16$/);

4
test/parallel/test-crypto-hmac.js
View File

@ -377,3 +377,7 @@ for (let i = 0, l = rfc2202_sha1.length; i < l; i++) {
`Test HMAC-SHA1 : Test case ${i + 1} rfc 2202` `Test HMAC-SHA1 : Test case ${i + 1} rfc 2202`
); );
} }
assert.throws(function() {
crypto.createHmac('sha256', 'w00t').digest('ucs2');
}, /^Error: hmac\.digest\(\) does not support UTF-16$/);