fixup! crypto: add X.509 generation with CSR support

Author: panva

deps/ncrypto/ncrypto.h

@@ -1691,7 +1691,6 @@ class X509View final {
   enum class CheckKeyResult {
     MATCH,                  // The requested comparison passed.
     NO_MATCH,               // It completed and produced an ordinary mismatch.
-    INVALID_CERTIFICATE,    // Reserved for certificate verification.
     UNSUPPORTED_OPERATION,  // The backend cannot compare these keys.
     OPERATION_FAILED,       // The backend failed for another reason.
   };

lib/internal/crypto/x509_generation.js

@@ -17,6 +17,7 @@ const {
   SafeSet,
   StringPrototypeCharCodeAt,
   StringPrototypeIncludes,
+  StringPrototypeIsWellFormed,
   StringPrototypeSlice,
   Uint8Array,
 } = primordials;
@@ -145,12 +146,11 @@ function getRequired(object, property, name) {
   return value;
 }
 
-function snapshotBinary(value, name) {
+function snapshotBinary(value, name, expectedTypes = [
+  'ArrayBuffer', 'SharedArrayBuffer', 'Buffer', 'TypedArray', 'DataView',
+]) {
   if (!isAnyArrayBuffer(value) && !isArrayBufferView(value)) {
-    throw new ERR_INVALID_ARG_TYPE(
-      name,
-      ['ArrayBuffer', 'SharedArrayBuffer', 'Buffer', 'TypedArray', 'DataView'],
-      value);
+    throw new ERR_INVALID_ARG_TYPE(name, expectedTypes, value);
   }
   const view = isAnyArrayBuffer(value) ?
     new Uint8Array(value) :
@@ -160,39 +160,21 @@ function snapshotBinary(value, name) {
 
 function snapshotCertificateRequest(value) {
   if (typeof value === 'string') return Buffer.from(value);
-  if (!isAnyArrayBuffer(value) && !isArrayBufferView(value)) {
-    throw new ERR_INVALID_ARG_TYPE(
-      'options.csr',
-      [
-        'string',
-        'ArrayBuffer',
-        'SharedArrayBuffer',
-        'Buffer',
-        'TypedArray',
-        'DataView',
-      ],
-      value);
-  }
-  const view = isAnyArrayBuffer(value) ?
-    new Uint8Array(value) :
-    new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
-  return Buffer.from(view);
+  return snapshotBinary(value, 'options.csr', [
+    'string',
+    'ArrayBuffer',
+    'SharedArrayBuffer',
+    'Buffer',
+    'TypedArray',
+    'DataView',
+  ]);
 }
 
 function validateUnicode(value, name) {
   validateString(value, name);
-  for (let i = 0; i < value.length; i++) {
-    const first = StringPrototypeCharCodeAt(value, i);
-    if (first >= 0xd800 && first <= 0xdbff) {
-      const second = StringPrototypeCharCodeAt(value, ++i);
-      if (!(second >= 0xdc00 && second <= 0xdfff)) {
-        throw new ERR_INVALID_ARG_VALUE(
-          name, value, 'contains an unpaired surrogate');
-      }
-    } else if (first >= 0xdc00 && first <= 0xdfff) {
-      throw new ERR_INVALID_ARG_VALUE(
-        name, value, 'contains an unpaired surrogate');
-    }
+  if (!StringPrototypeIsWellFormed(value)) {
+    throw new ERR_INVALID_ARG_VALUE(
+      name, value, 'contains an unpaired surrogate');
   }
 }
 

src/crypto/crypto_x509_gen.cc

@@ -1009,7 +1009,6 @@ Maybe<void> X509GenerateTraits::AdditionalConfig(
       return Nothing<void>();
     case ncrypto::X509View::CheckKeyResult::UNSUPPORTED_OPERATION:
       break;
-    case ncrypto::X509View::CheckKeyResult::INVALID_CERTIFICATE:
     case ncrypto::X509View::CheckKeyResult::OPERATION_FAILED:
       THROW_ERR_CRYPTO_OPERATION_FAILED(env, "Failed to compare public keys");
       return Nothing<void>();