Skip to content

Commit 010d29d

Browse files
danbevtargos
authored andcommitted
src: fix ValidateDSAParameters when fips is enabled
Currently, the following compilation errors are generated when configuring --openssl-is-fips: ../src/node_crypto.cc: In function ‘bool node::crypto::ValidateDSAParameters(EVP_PKEY*)’: ../src/node_crypto.cc:4886:55: error: ‘pkey’ was not declared in this scope if (FIPS_mode() && EVP_PKEY_DSA == EVP_PKEY_base_id(pkey.get())) { ^~~~ ../src/node_crypto.cc:4886:55: note: suggested alternative: ‘key’ if (FIPS_mode() && EVP_PKEY_DSA == EVP_PKEY_base_id(pkey.get())) { ^~~~ key ../src/node_crypto.cc:4898:35: error: expected ‘;’ before ‘}’ token (L == 3072 && N == 256) ^ ; } This commit fixes the errors, and after this compilation is successful. PR-URL: #29407 Reviewed-By: David Carlier <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent d6ba106 commit 010d29d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/node_crypto.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -4880,8 +4880,8 @@ static AllocatedBuffer Node_SignFinal(Environment* env,
48804880
static inline bool ValidateDSAParameters(EVP_PKEY* key) {
48814881
#ifdef NODE_FIPS_MODE
48824882
/* Validate DSA2 parameters from FIPS 186-4 */
4883-
if (FIPS_mode() && EVP_PKEY_DSA == EVP_PKEY_base_id(pkey.get())) {
4884-
DSA* dsa = EVP_PKEY_get0_DSA(pkey.get());
4883+
if (FIPS_mode() && EVP_PKEY_DSA == EVP_PKEY_base_id(key)) {
4884+
DSA* dsa = EVP_PKEY_get0_DSA(key);
48854885
const BIGNUM* p;
48864886
DSA_get0_pqg(dsa, &p, nullptr, nullptr);
48874887
size_t L = BN_num_bits(p);
@@ -4892,7 +4892,7 @@ static inline bool ValidateDSAParameters(EVP_PKEY* key) {
48924892
return (L == 1024 && N == 160) ||
48934893
(L == 2048 && N == 224) ||
48944894
(L == 2048 && N == 256) ||
4895-
(L == 3072 && N == 256)
4895+
(L == 3072 && N == 256);
48964896
}
48974897
#endif // NODE_FIPS_MODE
48984898

0 commit comments

Comments
 (0)