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

crypto: simplify Hmac::HmacUpdate

Browse Source 
This makes HmacUpdate slightly simpler and introduces a CHECK instead
of ignoring invalid input types.

PR-URL: https://github.com/nodejs/node/pull/22132
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Tobias Nießen 2018-08-05 00:24:07 +02:00 committed by Trivikram Kamat
parent 5fded26e9e
commit 7e29453d2f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node_crypto.cc
View File

@ -3252,15 +3252,14 @@ void Hmac::HmacUpdate(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&hmac, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&hmac, args.Holder());
// Only copy the data if we have to, because it's a string // Only copy the data if we have to, because it's a string
bool r = true; bool r = false;
if (args[0]->IsString()) { if (args[0]->IsString()) {
StringBytes::InlineDecoder decoder; StringBytes::InlineDecoder decoder;
if (!decoder.Decode(env, args[0].As<String>(), args[1], UTF8)) { if (decoder.Decode(env, args[0].As<String>(), args[1], UTF8)) {
args.GetReturnValue().Set(false); r = hmac->HmacUpdate(decoder.out(), decoder.size());
return;
} }
r = hmac->HmacUpdate(decoder.out(), decoder.size()); } else {
} else if (args[0]->IsArrayBufferView()) { CHECK(args[0]->IsArrayBufferView());
char* buf = Buffer::Data(args[0]); char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]); size_t buflen = Buffer::Length(args[0]);
r = hmac->HmacUpdate(buf, buflen); r = hmac->HmacUpdate(buf, buflen);