fixup! crypto: add optional callback to crypto.sign and crypto.verify

panva · panva · commit 8176164db379 · 2021-03-10T16:43:32.000+01:00
diff --git a/src/crypto/crypto_sig.cc b/src/crypto/crypto_sig.cc
@@ -234,12 +234,15 @@ bool IsOneShot(const ManagedEVPPKey& key) {
   }
 }
 
-bool UseP1363Encoding(const SignConfiguration& params) {
-  switch (EVP_PKEY_id(params.key->GetAsymmetricKey().get())) {
+bool UseP1363Encoding(const ManagedEVPPKey& key,
+                      const DSASigEnc& dsa_encoding) {
+  switch (EVP_PKEY_id(key.get())) {
     case EVP_PKEY_EC:
-    case EVP_PKEY_DSA: return params.dsa_encoding == kSigEncP1363;
+    case EVP_PKEY_DSA:
+      return dsa_encoding == kSigEncP1363;
+    default:
+      return false;
   }
-  return false;
 }
 }  // namespace
 
@@ -775,7 +778,7 @@ Maybe<bool> SignTraits::AdditionalConfig(
     // the signature from WebCrypto format into DER format...
     ManagedEVPPKey m_pkey = params->key->GetAsymmetricKey();
     Mutex::ScopedLock lock(*m_pkey.mutex());
-    if (UseP1363Encoding(*params)) {
+    if (UseP1363Encoding(m_pkey, params->dsa_encoding)) {
       params->signature =
           ConvertFromWebCryptoSignature(m_pkey, signature.ToByteSource());
     } else {
@@ -872,7 +875,7 @@ bool SignTraits::DeriveBits(
         if (!EVP_DigestSignFinal(context.get(), data, &len))
           return false;
 
-        if (UseP1363Encoding(params)) {
+        if (UseP1363Encoding(m_pkey, params.dsa_encoding)) {
           *out = ConvertToWebCryptoSignature(
               params.key->GetAsymmetricKey(), buf);
         } else {
