@@ -4105,10 +4105,7 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
4105
4105
4106
4106
DiffieHellman* diffieHellman;
4107
4107
ASSIGN_OR_RETURN_UNWRAP (&diffieHellman, args.Holder ());
4108
-
4109
- if (!diffieHellman->initialised_ ) {
4110
- return ThrowCryptoError (env, ERR_get_error (), " Not initialized" );
4111
- }
4108
+ CHECK (diffieHellman->initialised_ );
4112
4109
4113
4110
if (!DH_generate_key (diffieHellman->dh_ .get ())) {
4114
4111
return ThrowCryptoError (env, ERR_get_error (), " Key generation failed" );
@@ -4130,7 +4127,7 @@ void DiffieHellman::GetField(const FunctionCallbackInfo<Value>& args,
4130
4127
4131
4128
DiffieHellman* dh;
4132
4129
ASSIGN_OR_RETURN_UNWRAP (&dh, args.Holder ());
4133
- if (! dh->initialised_ ) return env-> ThrowError ( " Not initialized " );
4130
+ CHECK ( dh->initialised_ );
4134
4131
4135
4132
const BIGNUM* num = get_field (dh->dh_ .get ());
4136
4133
if (num == nullptr ) return env->ThrowError (err_if_null);
@@ -4182,10 +4179,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
4182
4179
4183
4180
DiffieHellman* diffieHellman;
4184
4181
ASSIGN_OR_RETURN_UNWRAP (&diffieHellman, args.Holder ());
4185
-
4186
- if (!diffieHellman->initialised_ ) {
4187
- return ThrowCryptoError (env, ERR_get_error (), " Not initialized" );
4188
- }
4182
+ CHECK (diffieHellman->initialised_ );
4189
4183
4190
4184
ClearErrorOnReturn clear_error_on_return;
4191
4185
@@ -4253,7 +4247,7 @@ void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<Value>& args,
4253
4247
4254
4248
DiffieHellman* dh;
4255
4249
ASSIGN_OR_RETURN_UNWRAP (&dh, args.Holder ());
4256
- if (! dh->initialised_ ) return env-> ThrowError ( " Not initialized " );
4250
+ CHECK ( dh->initialised_ );
4257
4251
4258
4252
char errmsg[64 ];
4259
4253
@@ -4299,10 +4293,7 @@ void DiffieHellman::VerifyErrorGetter(const FunctionCallbackInfo<Value>& args) {
4299
4293
4300
4294
DiffieHellman* diffieHellman;
4301
4295
ASSIGN_OR_RETURN_UNWRAP (&diffieHellman, args.Holder ());
4302
-
4303
- if (!diffieHellman->initialised_ )
4304
- return ThrowCryptoError (diffieHellman->env (), ERR_get_error (),
4305
- " Not initialized" );
4296
+ CHECK (diffieHellman->initialised_ );
4306
4297
4307
4298
args.GetReturnValue ().Set (diffieHellman->verifyError_ );
4308
4299
}
0 commit comments