fixup! crypto: support loading private keys through STORE loaders

Author: panva

deps/ncrypto/ncrypto.cc

@@ -3764,6 +3764,7 @@ EVPKeyPointer::ParseKeyResult EVPKeyPointer::TryLoadPrivateKeyFromStore(
 
   // missing_passphrase is sticky, so a key that loaded anyway wins over it.
   if (pkey) {
+    ctx.reset();
     ERR_clear_error();
     return ParseKeyResult(std::move(pkey));
   }

deps/ncrypto/ncrypto.h

@@ -1698,6 +1698,7 @@ class EVPMDCtxPointer final {
   DataPointer sign(const Buffer<const unsigned char>& buf) const;
   bool verify(const Buffer<const unsigned char>& buf,
               const Buffer<const unsigned char>& sig) const;
+  // Unlike verify(), preserves EVP_DigestVerify()'s three-way result.
   int verifyOneShot(const Buffer<const unsigned char>& buf,
                     const Buffer<const unsigned char>& sig) const;
 

src/crypto/crypto_sig.cc

@@ -1016,6 +1016,11 @@ bool SignTraits::DeriveBits(Environment* env,
     case SignConfiguration::Mode::Verify: {
       auto buf = DataPointer::Alloc(1);
       static_cast<char*>(buf.get())[0] = 0;
+      // EVP_DigestVerify() documents 0 as a verification mismatch. In its
+      // Update/Final path, it maps a failed EVP_DigestVerifyUpdate() to -1.
+      // Some providers fail that combined operation but support raw
+      // verification of a precomputed digest, so only retry negative results.
+      // Retrying 0 would perform a second verification for every mismatch.
       int verify_result = context.verifyOneShot(params.data, params.signature);
       if (verify_result == 1 &&
           !HasSmallOrderEdDsaPoint(key, params.signature)) {

typings/internalBinding/crypto.d.ts

@@ -14,7 +14,7 @@ declare namespace InternalCryptoBinding {
     KeyFormatDER | KeyFormatPEM | KeyFormatJWK | KeyFormatRawPublic | undefined;
   type PrivateKeyFormat =
     KeyFormatDER | KeyFormatPEM | KeyFormatJWK |
-    KeyFormatRawPrivate | KeyFormatRawSeed | KeyFormatStore | undefined;
+    KeyFormatRawPrivate | KeyFormatRawSeed | undefined;
   type KeyFormat = PublicKeyFormat | PrivateKeyFormat;
   type KeyEncoding = string | number | null | undefined;
   type KeyPassphrase = ByteSource | null | undefined;
@@ -132,7 +132,7 @@ declare namespace InternalCryptoBinding {
 
   type PreparedAsymmetricKeyArgs = [
     keyData: PreparedAsymmetricKeyData,
-    keyFormat: KeyFormat,
+    keyFormat: KeyFormat | KeyFormatStore,
     keyType: KeyEncoding,
     keyPassphrase: KeyPassphrase,
     keyNamedCurve: NamedCurve,