@@ -4115,10 +4115,7 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
4115
4115
4116
4116
DiffieHellman* diffieHellman;
4117
4117
ASSIGN_OR_RETURN_UNWRAP (&diffieHellman, args.Holder ());
4118
-
4119
- if (!diffieHellman->initialised_ ) {
4120
- return ThrowCryptoError (env, ERR_get_error (), " Not initialized" );
4121
- }
4118
+ CHECK (diffieHellman->initialised_ );
4122
4119
4123
4120
if (!DH_generate_key (diffieHellman->dh_ .get ())) {
4124
4121
return ThrowCryptoError (env, ERR_get_error (), " Key generation failed" );
@@ -4140,7 +4137,7 @@ void DiffieHellman::GetField(const FunctionCallbackInfo<Value>& args,
4140
4137
4141
4138
DiffieHellman* dh;
4142
4139
ASSIGN_OR_RETURN_UNWRAP (&dh, args.Holder ());
4143
- if (! dh->initialised_ ) return env-> ThrowError ( " Not initialized " );
4140
+ CHECK ( dh->initialised_ );
4144
4141
4145
4142
const BIGNUM* num = get_field (dh->dh_ .get ());
4146
4143
if (num == nullptr ) return env->ThrowError (err_if_null);
@@ -4192,10 +4189,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
4192
4189
4193
4190
DiffieHellman* diffieHellman;
4194
4191
ASSIGN_OR_RETURN_UNWRAP (&diffieHellman, args.Holder ());
4195
-
4196
- if (!diffieHellman->initialised_ ) {
4197
- return ThrowCryptoError (env, ERR_get_error (), " Not initialized" );
4198
- }
4192
+ CHECK (diffieHellman->initialised_ );
4199
4193
4200
4194
ClearErrorOnReturn clear_error_on_return;
4201
4195
@@ -4263,7 +4257,7 @@ void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<Value>& args,
4263
4257
4264
4258
DiffieHellman* dh;
4265
4259
ASSIGN_OR_RETURN_UNWRAP (&dh, args.Holder ());
4266
- if (! dh->initialised_ ) return env-> ThrowError ( " Not initialized " );
4260
+ CHECK ( dh->initialised_ );
4267
4261
4268
4262
char errmsg[64 ];
4269
4263
@@ -4309,10 +4303,7 @@ void DiffieHellman::VerifyErrorGetter(const FunctionCallbackInfo<Value>& args) {
4309
4303
4310
4304
DiffieHellman* diffieHellman;
4311
4305
ASSIGN_OR_RETURN_UNWRAP (&diffieHellman, args.Holder ());
4312
-
4313
- if (!diffieHellman->initialised_ )
4314
- return ThrowCryptoError (diffieHellman->env (), ERR_get_error (),
4315
- " Not initialized" );
4306
+ CHECK (diffieHellman->initialised_ );
4316
4307
4317
4308
args.GetReturnValue ().Set (diffieHellman->verifyError_ );
4318
4309
}
0 commit comments