Skip to content

Commit fe422d2

Browse files
committed
crypto: make FIPS related options always available
nodejs/node#36341
1 parent afef8fc commit fe422d2

1 file changed

Lines changed: 40 additions & 0 deletions

File tree

patches/node/fix_comment_out_incompatible_crypto_modules.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,43 @@ index ea4c70ad5d8c844860ba3480fc7ef4205f0a3cdc..cdf8dd47d6e2a5894066cec01fbe347a
5454
ecdh->group_ = EC_KEY_get0_group(ecdh->key_.get());
5555
}
5656

57+
diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
58+
index f2f61aa45185812e9248845b664539be4fe24550..303ba4c3b7c4c2fc5dee906e22d5e7642b8351c8 100644
59+
--- a/src/crypto/crypto_util.h
60+
+++ b/src/crypto/crypto_util.h
61+
@@ -15,7 +15,9 @@
62+
#include <openssl/err.h>
63+
#include <openssl/evp.h>
64+
#include <openssl/ec.h>
65+
+#ifndef OPENSSL_IS_BORINGSSL
66+
#include <openssl/kdf.h>
67+
+#endif
68+
#include <openssl/rsa.h>
69+
#include <openssl/dsa.h>
70+
#include <openssl/ssl.h>
71+
diff --git a/src/node.cc b/src/node.cc
72+
index a99f2f4f01b16fc70f3038a25da22c788714b3f6..ceb532648b33a6c2f3b8a135b315985cfff5419e 100644
73+
--- a/src/node.cc
74+
+++ b/src/node.cc
75+
@@ -1020,7 +1020,7 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
76+
return result;
77+
}
78+
79+
-#if HAVE_OPENSSL
80+
+#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
81+
{
82+
std::string extra_ca_certs;
83+
if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))
84+
diff --git a/src/node_metadata.h b/src/node_metadata.h
85+
index 4486d5af2c1622c7c8f44401dc3ebb986d8e3c2e..db1769f1b3f1617ed8dbbea57b5e324183b42be2 100644
86+
--- a/src/node_metadata.h
87+
+++ b/src/node_metadata.h
88+
@@ -6,7 +6,7 @@
89+
#include <string>
90+
#include "node_version.h"
91+
92+
-#if HAVE_OPENSSL
93+
+#if 0
94+
#include <openssl/crypto.h>
95+
#endif // HAVE_OPENSSL
96+

0 commit comments

Comments
 (0)