Skip to content

Commit 579e066

Browse files
tniessenjuanarbol
authored andcommitted
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 <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent d76e7e4 commit 579e066

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/crypto/crypto_hkdf.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Maybe<bool> HKDFTraits::AdditionalConfig(
5858
Utf8Value hash(env->isolate(), args[offset]);
5959
params->digest = EVP_get_digestbyname(*hash);
6060
if (params->digest == nullptr) {
61-
THROW_ERR_CRYPTO_INVALID_DIGEST(env);
61+
THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *hash);
6262
return Nothing<bool>();
6363
}
6464

src/crypto/crypto_hmac.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ void Hmac::HmacInit(const char* hash_type, const char* key, int key_len) {
7070

7171
const EVP_MD* md = EVP_get_digestbyname(hash_type);
7272
if (md == nullptr)
73-
return THROW_ERR_CRYPTO_INVALID_DIGEST(env());
73+
return THROW_ERR_CRYPTO_INVALID_DIGEST(
74+
env(), "Invalid digest: %s", hash_type);
7475
if (key_len == 0) {
7576
key = "";
7677
}
@@ -187,7 +188,7 @@ Maybe<bool> HmacTraits::AdditionalConfig(
187188
Utf8Value digest(env->isolate(), args[offset + 1]);
188189
params->digest = EVP_get_digestbyname(*digest);
189190
if (params->digest == nullptr) {
190-
THROW_ERR_CRYPTO_INVALID_DIGEST(env);
191+
THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
191192
return Nothing<bool>();
192193
}
193194

src/crypto/crypto_rsa.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ Maybe<bool> RSACipherTraits::AdditionalConfig(
333333

334334
params->digest = EVP_get_digestbyname(*digest);
335335
if (params->digest == nullptr) {
336-
THROW_ERR_CRYPTO_INVALID_DIGEST(env);
336+
THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
337337
return Nothing<bool>();
338338
}
339339

src/crypto/crypto_sig.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ Maybe<bool> SignTraits::AdditionalConfig(
648648
Utf8Value digest(env->isolate(), args[offset + 6]);
649649
params->digest = EVP_get_digestbyname(*digest);
650650
if (params->digest == nullptr) {
651-
THROW_ERR_CRYPTO_INVALID_DIGEST(env);
651+
THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest);
652652
return Nothing<bool>();
653653
}
654654
}

0 commit comments

Comments
 (0)