crypto: better crypto error messages

doc/api/errors.md

@@ -189,9 +189,10 @@ intercepted.
 A generic JavaScript `Error` object that does not denote any specific
 circumstance of why the error occurred. `Error` objects capture a "stack trace"
 detailing the point in the code at which the `Error` was instantiated, and may
-provide a text description of the error. For crypto only, `Error` objects will
-include the OpenSSL error stack, if it's available when the error is thrown, in
-a separate property.
+provide a text description of the error.
+
+For crypto only, `Error` objects will include the OpenSSL error stack in a
+separate property if it is available when the error is thrown.
 
 All errors generated by Node.js, including all System and JavaScript errors,
 will either be instances of, or inherit from, the `Error` class.

src/env.h

@@ -211,6 +211,7 @@ namespace node {
   V(onstreamclose_string, "onstreamclose")                                    \
   V(ontrailers_string, "ontrailers")                                          \
   V(onwrite_string, "onwrite")                                                \
+  V(openssl_error_stack, "openSSLErrorStack")                                 \
   V(output_string, "output")                                                  \
   V(order_string, "order")                                                    \
   V(owner_string, "owner")                                                    \

src/node_crypto.cc

@@ -262,20 +262,16 @@ void ThrowCryptoError(Environment* env,
     ERR_error_string_n(err, errmsg, sizeof(errmsg));
     message = String::NewFromUtf8(env->isolate(), errmsg,
                                   v8::NewStringType::kNormal)
-                                    .ToLocalChecked();
+                                      .ToLocalChecked();
   } else {
     message = String::NewFromUtf8(env->isolate(), default_message,
                                   v8::NewStringType::kNormal)
-                                    .ToLocalChecked();
+                                      .ToLocalChecked();
   }
 
   Local<Value> exception_v = Exception::Error(message);
   CHECK(!exception_v.IsEmpty());
-  // Add the openSSLErrorStack property to the exception object.
   Local<Object> exception = exception_v.As<Object>();
-  Local<String> key = String::NewFromUtf8(env->isolate(), "openSSLErrorStack",
-                                          v8::NewStringType::kInternalized)
-                                            .ToLocalChecked();
   Local<Array> errorStack = Array::New(env->isolate());
 
   ERR_STATE *es = ERR_get_state();
@@ -289,17 +285,18 @@ void ThrowCryptoError(Environment* env,
       ERR_error_string_n(err_buf, tmpStr, sizeof(tmpStr));
       errorStack->Set(i, String::NewFromUtf8(env->isolate(), tmpStr,
                                              v8::NewStringType::kNormal)
-                                              .ToLocalChecked());
+                                                .ToLocalChecked());
     }
     es->top -= 1;
   }
 
-  // Adding the new property that will look like the following:
+  // Add the openSSLErrorStack property to the exception object.
+  // The new property will look like the following:
   // openSSLErrorStack: [
   // 'error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib',
   // 'error:0D07803A:asn1 encoding routines:ASN1_ITEM_EX_D2I:nested asn1 error'
   // ]
-  exception->Set(env->context(), key, errorStack).FromJust();
+  exception->Set(env->openssl_error_stack(), errorStack);
   env->isolate()->ThrowException(exception);
 }
 

test/parallel/test-crypto.js

@@ -244,6 +244,7 @@ assert.throws(function() {
   if ((err instanceof Error) &&
       /digest too big for rsa key$/.test(err) &&
       err.openSSLErrorStack !== undefined &&
+      Array.isArray(err.openSSLErrorStack) &&
       err.openSSLErrorStack.length === 0) {
     return true;
   }
@@ -269,6 +270,7 @@ assert.throws(function() {
   if ((err instanceof Error) &&
       /asn1 encoding routines:ASN1_CHECK_TLEN:wrong tag/.test(err) &&
       err.openSSLErrorStack !== undefined &&
+      Array.isArray(err.openSSLErrorStack) &&
       err.openSSLErrorStack.length > 0) {
     return true;
   }