Commit c868e36
crypto: add digest name to INVALID_DIGEST errors
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>1 parent 05006ed commit c868e36
4 files changed
Lines changed: 6 additions & 5 deletions
| 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 | |
|---|---|---|---|
@@ -72,7 +72,8 @@ void Hmac::HmacInit(const char* hash_type, const char* key, int key_len) { | |||
| 72 | 72 | ||
| 73 | 73 | const EVP_MD* md = EVP_get_digestbyname(hash_type); | |
| 74 | 74 | if (md == nullptr) | |
| 75 | - return THROW_ERR_CRYPTO_INVALID_DIGEST(env()); | ||
| 75 | + return THROW_ERR_CRYPTO_INVALID_DIGEST( | ||
| 76 | + env(), "Invalid digest: %s", hash_type); | ||
| 76 | 77 | if (key_len == 0) { | |
| 77 | 78 | key = ""; | |
| 78 | 79 | } | |
@@ -189,7 +190,7 @@ Maybe<bool> HmacTraits::AdditionalConfig( | |||
| 189 | 190 | Utf8Value digest(env->isolate(), args[offset + 1]); | |
| 190 | 191 | params->digest = EVP_get_digestbyname(*digest); | |
| 191 | 192 | if (params->digest == nullptr) { | |
| 192 | - THROW_ERR_CRYPTO_INVALID_DIGEST(env); | ||
| 193 | + THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest); | ||
| 193 | 194 | return Nothing<bool>(); | |
| 194 | 195 | } | |
| 195 | 196 | ||
| 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 | } | |
0 commit comments