crypto: add digest name to INVALID_DIGEST errors

tniessen · RafaelGSS · commit c868e3638561 · 2022-09-07T13:25:07.000-03:00
We already do this in some places. This adds the digest name to remaining uses of ERR_CRYPTO_INVALID_DIGEST except for one occurrence in crypto_sig.cc that would require significant refactoring due to the unusual error handling there. PR-URL: #44468 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/src/crypto/crypto_hkdf.cc b/src/crypto/crypto_hkdf.cc
@@ -58,7 +58,7 @@ Maybe<bool> HKDFTraits::AdditionalConfig(
   Utf8Value hash(env->isolate(), args[offset]);
   params->digest = EVP_get_digestbyname(*hash);
   if (params->digest == nullptr) {
-    THROW_ERR_CRYPTO_INVALID_DIGEST(env);
+    THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *hash);
     return Nothing<bool>();
   }
 
diff --git a/src/crypto/crypto_hmac.cc b/src/crypto/crypto_hmac.cc
@@ -72,7 +72,8 @@ void Hmac::HmacInit(const char* hash_type, const char* key, int key_len) {
 
   const EVP_MD* md = EVP_get_digestbyname(hash_type);
   if (md == nullptr)
-    return THROW_ERR_CRYPTO_INVALID_DIGEST(env());
+    return THROW_ERR_CRYPTO_INVALID_DIGEST(
+        env(), "Invalid digest: %s", hash_type);
   if (key_len == 0) {
     key = "";
   }
@@ -189,7 +190,7 @@ Maybe<bool> HmacTraits::AdditionalConfig(
   Utf8Value digest(env->isolate(), args[offset + 1]);
   params->digest = EVP_get_digestbyname(*digest);
   if (params->digest == nullptr) {
-    THROW_ERR_CRYPTO_INVALID_DIGEST(env);
+    THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
     return Nothing<bool>();
   }
 
diff --git a/src/crypto/crypto_rsa.cc b/src/crypto/crypto_rsa.cc
@@ -328,7 +328,7 @@ Maybe<bool> RSACipherTraits::AdditionalConfig(
 
       params->digest = EVP_get_digestbyname(*digest);
       if (params->digest == nullptr) {
-        THROW_ERR_CRYPTO_INVALID_DIGEST(env);
+        THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
         return Nothing<bool>();
       }
 
diff --git a/src/crypto/crypto_sig.cc b/src/crypto/crypto_sig.cc
@@ -647,7 +647,7 @@ Maybe<bool> SignTraits::AdditionalConfig(
     Utf8Value digest(env->isolate(), args[offset + 6]);
     params->digest = EVP_get_digestbyname(*digest);
     if (params->digest == nullptr) {
-      THROW_ERR_CRYPTO_INVALID_DIGEST(env);
+      THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
       return Nothing<bool>();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ Maybe<bool> HKDFTraits::AdditionalConfig(`
`58`	`58`	`Utf8Value hash(env->isolate(), args[offset]);`
`59`	`59`	`params->digest = EVP_get_digestbyname(*hash);`
`60`	`60`	`if (params->digest == nullptr) {`
`61`		`- THROW_ERR_CRYPTO_INVALID_DIGEST(env);`
	`61`	`+ THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *hash);`
`62`	`62`	`return Nothing<bool>();`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ Maybe<bool> RSACipherTraits::AdditionalConfig(`
`328`	`328`
`329`	`329`	`params->digest = EVP_get_digestbyname(*digest);`
`330`	`330`	`if (params->digest == nullptr) {`
`331`		`- THROW_ERR_CRYPTO_INVALID_DIGEST(env);`
	`331`	`+ THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);`
`332`	`332`	`return Nothing<bool>();`
`333`	`333`	`}`
`334`	`334`
Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ Maybe<bool> SignTraits::AdditionalConfig(`
`647`	`647`	`Utf8Value digest(env->isolate(), args[offset + 6]);`
`648`	`648`	`params->digest = EVP_get_digestbyname(*digest);`
`649`	`649`	`if (params->digest == nullptr) {`
`650`		`- THROW_ERR_CRYPTO_INVALID_DIGEST(env);`
	`650`	`+ THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);`
`651`	`651`	`return Nothing<bool>();`
`652`	`652`	`}`
`653`	`653`	`}`