|
 |
b24b2a |
From f2b5ee60b7e1f01a6678ee3172c6fa59c6ce8da1 Mon Sep 17 00:00:00 2001
|
|
|
d744d0 |
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
|
|
|
d744d0 |
Date: Tue, 28 Apr 2020 11:15:24 +0200
|
|
|
d744d0 |
Subject: [PATCH] Link with ssl-shim
|
|
|
d744d0 |
MIME-Version: 1.0
|
|
|
d744d0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d744d0 |
Content-Transfer-Encoding: 8bit
|
|
|
d744d0 |
|
|
|
d744d0 |
Signed-off-by: Jan Staněk <jstanek@redhat.com>
|
|
|
d744d0 |
---
|
|
|
d744d0 |
node.gypi | 10 +++++++---
|
|
|
d744d0 |
src/node_crypto.cc | 2 +-
|
|
|
d744d0 |
src/node_crypto.h | 2 ++
|
|
|
d744d0 |
3 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
d744d0 |
|
|
|
d744d0 |
diff --git a/node.gypi b/node.gypi
|
|
|
d744d0 |
index 116c1c7149..0e40a2b441 100644
|
|
|
d744d0 |
--- a/node.gypi
|
|
|
d744d0 |
+++ b/node.gypi
|
|
|
d744d0 |
@@ -365,9 +365,13 @@
|
|
|
d744d0 |
],
|
|
|
d744d0 |
}],
|
|
|
d744d0 |
],
|
|
|
d744d0 |
- }]]
|
|
|
d744d0 |
-
|
|
|
d744d0 |
- }, {
|
|
|
d744d0 |
+ }],
|
|
|
d744d0 |
+ [ 'node_shared_openssl=="true"', {
|
|
|
d744d0 |
+ 'include_dirs': ['deps/node-ssl-shim/include'],
|
|
|
d744d0 |
+ 'libraries': ['
|
|
|
d744d0 |
+ }]
|
|
|
d744d0 |
+ ]},
|
|
|
d744d0 |
+ {
|
|
|
d744d0 |
'defines': [ 'HAVE_OPENSSL=0' ]
|
|
|
d744d0 |
}],
|
|
|
d744d0 |
|
|
|
d744d0 |
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
|
|
|
b24b2a |
index db2e122ab0..90df5f25e0 100644
|
|
|
d744d0 |
--- a/src/node_crypto.cc
|
|
|
d744d0 |
+++ b/src/node_crypto.cc
|
|
|
b24b2a |
@@ -1135,7 +1135,7 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo<Value>& args) {
|
|
|
d744d0 |
|
|
|
d744d0 |
void SecureContext::SetCipherSuites(const FunctionCallbackInfo<Value>& args) {
|
|
|
d744d0 |
// BoringSSL doesn't allow API config of TLS1.3 cipher suites.
|
|
|
d744d0 |
-#ifndef OPENSSL_IS_BORINGSSL
|
|
|
d744d0 |
+#if !defined OPENSSL_IS_BORINGSSL && !OPENSSL_IS_LEGACY
|
|
|
d744d0 |
SecureContext* sc;
|
|
|
d744d0 |
ASSIGN_OR_RETURN_UNWRAP(&sc, args.Holder());
|
|
|
d744d0 |
Environment* env = sc->env();
|
|
|
d744d0 |
diff --git a/src/node_crypto.h b/src/node_crypto.h
|
|
|
b24b2a |
index 38fd806e62..0b9dab833d 100644
|
|
|
d744d0 |
--- a/src/node_crypto.h
|
|
|
d744d0 |
+++ b/src/node_crypto.h
|
|
|
b24b2a |
@@ -41,6 +41,8 @@
|
|
|
d744d0 |
#include <openssl/ec.h>
|
|
|
d744d0 |
#include <openssl/rsa.h>
|
|
|
d744d0 |
|
|
|
d744d0 |
+#include <node-ssl-shim/ssl-shim.h>
|
|
|
d744d0 |
+
|
|
|
d744d0 |
namespace node {
|
|
|
d744d0 |
namespace crypto {
|
|
|
d744d0 |
|
|
|
d744d0 |
--
|
|
|
b24b2a |
2.28.0
|
|
|
d744d0 |
|