src: simplify error handling in crypto_common

Author: jasnell

src/crypto/crypto_common.cc

@@ -243,11 +243,10 @@ MaybeLocal<Object> GetEphemeralKey(Environment* env, const SSLPointer& ssl) {
 MaybeLocal<Object> ECPointToBuffer(Environment* env,
                                    const EC_GROUP* group,
                                    const EC_POINT* point,
-                                   point_conversion_form_t form,
-                                   const char** error) {
+                                   point_conversion_form_t form) {
   size_t len = EC_POINT_point2oct(group, point, form, nullptr, 0, nullptr);
   if (len == 0) {
-    if (error != nullptr) *error = "Failed to get public key length";
+    THROW_ERR_CRYPTO_OPERATION_FAILED(env, "Failed to get public key length");
     return MaybeLocal<Object>();
   }
 
@@ -261,7 +260,7 @@ MaybeLocal<Object> ECPointToBuffer(Environment* env,
                            bs->ByteLength(),
                            nullptr);
   if (len == 0) {
-    if (error != nullptr) *error = "Failed to get public key";
+    THROW_ERR_CRYPTO_OPERATION_FAILED(env, "Failed to get public key");
     return MaybeLocal<Object>();
   }
 

src/crypto/crypto_common.h

@@ -35,12 +35,10 @@ v8::MaybeLocal<v8::Value> GetPeerCert(Environment* env,
                                       bool abbreviated = false,
                                       bool is_server = false);
 
-v8::MaybeLocal<v8::Object> ECPointToBuffer(
-    Environment* env,
-    const EC_GROUP* group,
-    const EC_POINT* point,
-    point_conversion_form_t form,
-    const char** error);
+v8::MaybeLocal<v8::Object> ECPointToBuffer(Environment* env,
+                                           const EC_GROUP* group,
+                                           const EC_POINT* point,
+                                           point_conversion_form_t form);
 
 }  // namespace crypto
 }  // namespace node

src/crypto/crypto_ec.cc

@@ -235,11 +235,10 @@ void ECDH::GetPublicKey(const FunctionCallbackInfo<Value>& args) {
   uint32_t val = args[0].As<Uint32>()->Value();
   point_conversion_form_t form = static_cast<point_conversion_form_t>(val);
 
-  const char* error;
   Local<Object> buf;
-  if (!ECPointToBuffer(env, group, pub, form, &error).ToLocal(&buf))
-    return THROW_ERR_CRYPTO_OPERATION_FAILED(env, error);
-  args.GetReturnValue().Set(buf);
+  if (ECPointToBuffer(env, group, pub, form).ToLocal(&buf)) {
+    args.GetReturnValue().Set(buf);
+  }
 }
 
 void ECDH::GetPrivateKey(const FunctionCallbackInfo<Value>& args) {
@@ -397,11 +396,10 @@ void ECDH::ConvertKey(const FunctionCallbackInfo<Value>& args) {
   uint32_t val = args[2].As<Uint32>()->Value();
   point_conversion_form_t form = static_cast<point_conversion_form_t>(val);
 
-  const char* error;
   Local<Object> buf;
-  if (!ECPointToBuffer(env, group, pub, form, &error).ToLocal(&buf))
-    return THROW_ERR_CRYPTO_OPERATION_FAILED(env, error);
-  args.GetReturnValue().Set(buf);
+  if (ECPointToBuffer(env, group, pub, form).ToLocal(&buf)) {
+    args.GetReturnValue().Set(buf);
+  }
 }
 
 void ECDHBitsConfig::MemoryInfo(MemoryTracker* tracker) const {

src/crypto/crypto_util.cc

@@ -285,13 +285,14 @@ MaybeLocal<Value> CryptoErrorStore::ToException(
     // Use last element as the error message, everything else goes
     // into the .opensslErrorStack property on the exception object.
     const std::string& last_error_string = copy.errors_.back();
-    Local<String> exception_string;
+    Local<Value> exception_string;
     if (!ToV8Value(env->context(), last_error_string)
              .ToLocal(&exception_string)) {
       return MaybeLocal<Value>();
     }
+    DCHECK(exception_string->IsString());
     copy.errors_.pop_back();
-    return copy.ToException(env, exception_string);
+    return copy.ToException(env, exception_string.As<v8::String>());
   }
 
   Local<Value> exception_v = Exception::Error(exception_string);

src/crypto/crypto_x509.cc

@@ -650,7 +650,7 @@ MaybeLocal<Value> GetECPubKey(Environment* env,
   if (pubkey == nullptr) [[unlikely]]
     return Undefined(env->isolate());
 
-  return ECPointToBuffer(env, group, pubkey, EC_KEY_get_conv_form(ec), nullptr)
+  return ECPointToBuffer(env, group, pubkey, EC_KEY_get_conv_form(ec))
       .FromMaybe(Local<Object>());
 }