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

crypto: simplify internal state handling

Browse Source 
Uninitialized instances are not exposed to users, so this condition should
always be true.

PR-URL: https://github.com/nodejs/node/pull/23648
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Tobias Nießen 2018-10-13 23:08:24 +02:00
parent 4e2862ad9e
commit e2f58c71dd
No known key found for this signature in database
GPG Key ID: 718207F8FD156B70
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/node_crypto.cc
View File

@ -4105,10 +4105,7 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
DiffieHellman* diffieHellman; DiffieHellman* diffieHellman;
ASSIGN_OR_RETURN_UNWRAP(&diffieHellman, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&diffieHellman, args.Holder());
CHECK(diffieHellman->initialised_);
if (!diffieHellman->initialised_) {
return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
}
if (!DH_generate_key(diffieHellman->dh_.get())) { if (!DH_generate_key(diffieHellman->dh_.get())) {
return ThrowCryptoError(env, ERR_get_error(), "Key generation failed"); return ThrowCryptoError(env, ERR_get_error(), "Key generation failed");
@ -4130,7 +4127,7 @@ void DiffieHellman::GetField(const FunctionCallbackInfo<Value>& args,
DiffieHellman* dh; DiffieHellman* dh;
ASSIGN_OR_RETURN_UNWRAP(&dh, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&dh, args.Holder());
if (!dh->initialised_) return env->ThrowError("Not initialized"); CHECK(dh->initialised_);
const BIGNUM* num = get_field(dh->dh_.get()); const BIGNUM* num = get_field(dh->dh_.get());
if (num == nullptr) return env->ThrowError(err_if_null); if (num == nullptr) return env->ThrowError(err_if_null);
@ -4182,10 +4179,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
DiffieHellman* diffieHellman; DiffieHellman* diffieHellman;
ASSIGN_OR_RETURN_UNWRAP(&diffieHellman, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&diffieHellman, args.Holder());
CHECK(diffieHellman->initialised_);
if (!diffieHellman->initialised_) {
return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
}
ClearErrorOnReturn clear_error_on_return; ClearErrorOnReturn clear_error_on_return;
@ -4253,7 +4247,7 @@ void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<Value>& args,
DiffieHellman* dh; DiffieHellman* dh;
ASSIGN_OR_RETURN_UNWRAP(&dh, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&dh, args.Holder());
if (!dh->initialised_) return env->ThrowError("Not initialized"); CHECK(dh->initialised_);
char errmsg[64]; char errmsg[64];
@ -4299,10 +4293,7 @@ void DiffieHellman::VerifyErrorGetter(const FunctionCallbackInfo<Value>& args) {
DiffieHellman* diffieHellman; DiffieHellman* diffieHellman;
ASSIGN_OR_RETURN_UNWRAP(&diffieHellman, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&diffieHellman, args.Holder());
CHECK(diffieHellman->initialised_);
if (!diffieHellman->initialised_)
return ThrowCryptoError(diffieHellman->env(), ERR_get_error(),
"Not initialized");
args.GetReturnValue().Set(diffieHellman->verifyError_); args.GetReturnValue().Set(diffieHellman->verifyError_);
} }