Commit 28781a1
crypto: improve RSA-PSS digest error messages
md and mgf1_md are internal variable names and should not appear in
JS error messages. Also include the invalid digest name in the error
message.
PR-URL: #44307
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 6857ee8 commit 28781a1
2 files changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -153,7 +153,7 @@ Maybe<bool> RsaKeyGenTraits::AdditionalConfig( | |||
| 153 | 153 | Utf8Value digest(env->isolate(), args[*offset]); | |
| 154 | 154 | params->params.md = EVP_get_digestbyname(*digest); | |
| 155 | 155 | if (params->params.md == nullptr) { | |
| 156 | - THROW_ERR_CRYPTO_INVALID_DIGEST(env, "md specifies an invalid digest"); | ||
| 156 | + THROW_ERR_CRYPTO_INVALID_DIGEST(env, "Invalid digest: %s", *digest); | ||
| 157 | 157 | return Nothing<bool>(); | |
| 158 | 158 | } | |
| 159 | 159 | } | |
@@ -163,8 +163,8 @@ Maybe<bool> RsaKeyGenTraits::AdditionalConfig( | |||
| 163 | 163 | Utf8Value digest(env->isolate(), args[*offset + 1]); | |
| 164 | 164 | params->params.mgf1_md = EVP_get_digestbyname(*digest); | |
| 165 | 165 | if (params->params.mgf1_md == nullptr) { | |
| 166 | - THROW_ERR_CRYPTO_INVALID_DIGEST(env, | ||
| 167 | - "mgf1_md specifies an invalid digest"); | ||
| 166 | + THROW_ERR_CRYPTO_INVALID_DIGEST( | ||
| 167 | + env, "Invalid MGF1 digest: %s", *digest); | ||
| 168 | 168 | return Nothing<bool>(); | |
| 169 | 169 | } | |
| 170 | 170 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1661,7 +1661,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher); | |||
| 1661 | 1661 | }, common.mustNotCall()), { | |
| 1662 | 1662 | name: 'TypeError', | |
| 1663 | 1663 | code: 'ERR_CRYPTO_INVALID_DIGEST', | |
| 1664 | - message: 'md specifies an invalid digest' | ||
| 1664 | + message: 'Invalid digest: sha2' | ||
| 1665 | 1665 | }); | |
| 1666 | 1666 | ||
| 1667 | 1667 | assert.throws(() => generateKeyPair('rsa-pss', { | |
@@ -1670,7 +1670,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher); | |||
| 1670 | 1670 | }, common.mustNotCall()), { | |
| 1671 | 1671 | name: 'TypeError', | |
| 1672 | 1672 | code: 'ERR_CRYPTO_INVALID_DIGEST', | |
| 1673 | - message: 'mgf1_md specifies an invalid digest' | ||
| 1673 | + message: 'Invalid MGF1 digest: sha2' | ||
| 1674 | 1674 | }); | |
| 1675 | 1675 | } | |
| 1676 | 1676 | ||
0 commit comments