1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: fix ValidateDSAParameters when fips is enabled

Browse Source 
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: https://github.com/nodejs/node/pull/29407
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Daniel Bevenius 2019-09-02 10:36:39 +02:00
parent 02c74e72ea
commit 17d87d522c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/node_crypto.cc
View File

@ -4883,8 +4883,8 @@ static AllocatedBuffer Node_SignFinal(Environment* env,
static inline bool ValidateDSAParameters(EVP_PKEY* key) { static inline bool ValidateDSAParameters(EVP_PKEY* key) {
#ifdef NODE_FIPS_MODE #ifdef NODE_FIPS_MODE
/* Validate DSA2 parameters from FIPS 186-4 */ /* Validate DSA2 parameters from FIPS 186-4 */
if (FIPS_mode() && EVP_PKEY_DSA == EVP_PKEY_base_id(pkey.get())) { if (FIPS_mode() && EVP_PKEY_DSA == EVP_PKEY_base_id(key)) {
DSA* dsa = EVP_PKEY_get0_DSA(pkey.get()); DSA* dsa = EVP_PKEY_get0_DSA(key);
const BIGNUM* p; const BIGNUM* p;
DSA_get0_pqg(dsa, &p, nullptr, nullptr); DSA_get0_pqg(dsa, &p, nullptr, nullptr);
size_t L = BN_num_bits(p); size_t L = BN_num_bits(p);
@ -4895,7 +4895,7 @@ static inline bool ValidateDSAParameters(EVP_PKEY* key) {
return (L == 1024 && N == 160) || return (L == 1024 && N == 160) ||
(L == 2048 && N == 224) || (L == 2048 && N == 224) ||
(L == 2048 && N == 256) || (L == 2048 && N == 256) ||
(L == 3072 && N == 256) (L == 3072 && N == 256);
} }
#endif // NODE_FIPS_MODE #endif // NODE_FIPS_MODE