Skip to content

Commit 721ece3

Browse files
committed
src: add --openssl-legacy-provider option
nodejs/node#40478
1 parent 3e46590 commit 721ece3

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch

+39
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,19 @@ index 58a5d88d7a10def618170550246fbf50685ac0a4..77af0661dbd056a38a8d7599b9e4f067
300300
}
301301
} // namespace
302302

303+
diff --git a/src/node_metadata.cc b/src/node_metadata.cc
304+
index 46d9be0dfcfdcf778ebaf0337517b7da3f68bc9b..435762f7df47459dc4e6e73a7c3d2376184bebcf 100644
305+
--- a/src/node_metadata.cc
306+
+++ b/src/node_metadata.cc
307+
@@ -9,7 +9,7 @@
308+
#include "v8.h"
309+
#include "zlib.h"
310+
311+
-#if HAVE_OPENSSL
312+
+#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
313+
#include <openssl/opensslv.h>
314+
#endif // HAVE_OPENSSL
315+
303316
diff --git a/src/node_metadata.h b/src/node_metadata.h
304317
index 4486d5af2c1622c7c8f44401dc3ebb986d8e3c2e..db1769f1b3f1617ed8dbbea57b5e324183b42be2 100644
305318
--- a/src/node_metadata.h
@@ -313,3 +326,29 @@ index 4486d5af2c1622c7c8f44401dc3ebb986d8e3c2e..db1769f1b3f1617ed8dbbea57b5e3241
313326
#include <openssl/crypto.h>
314327
#endif // HAVE_OPENSSL
315328

329+
diff --git a/src/node_options.cc b/src/node_options.cc
330+
index b82100b6907891063a37023e6ad21f79fffade1e..d78005d41bebff4e8729400cf08ab67d27098448 100644
331+
--- a/src/node_options.cc
332+
+++ b/src/node_options.cc
333+
@@ -5,7 +5,7 @@
334+
#include "node_binding.h"
335+
#include "node_external_reference.h"
336+
#include "node_internals.h"
337+
-#if HAVE_OPENSSL
338+
+#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
339+
#include "openssl/opensslv.h"
340+
#endif
341+
342+
diff --git a/src/node_options.h b/src/node_options.h
343+
index 32e68086502f3eebe2dbe232b198d663db951125..cb4b6215ffbace04ecd4ad694ae00493847a7324 100644
344+
--- a/src/node_options.h
345+
+++ b/src/node_options.h
346+
@@ -11,7 +11,7 @@
347+
#include "node_mutex.h"
348+
#include "util.h"
349+
350+
-#if HAVE_OPENSSL
351+
+#if 0
352+
#include "openssl/opensslv.h"
353+
#endif
354+

0 commit comments

Comments
 (0)