@@ -48,7 +48,7 @@ index 67cd4f2adf15e7d8511f561c54163b1842e971af..7e0e1a62289289b8362870ba4869c974
4848
4949 const EVP_MD* digest = nullptr;
5050diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
51- index 3517c39ad0b71a4d3efefeee2a3d55b70494bc1d..7164e539880e6d33ee1ea1fb77bae8adf4095708 100644
51+ index ee1c7931a5c83eec00fe05807ddb97572fe70cc9..8e297e57fdbc9fd42beb6e4a33cc91b9dd7316b8 100644
5252--- a/src/crypto/crypto_common.cc
5353+++ b/src/crypto/crypto_common.cc
5454@@ -158,7 +158,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
@@ -77,7 +77,7 @@ index 3517c39ad0b71a4d3efefeee2a3d55b70494bc1d..7164e539880e6d33ee1ea1fb77bae8ad
7777 if (!SSL_client_hello_get0_ext(
7878 ssl.get(),
7979 TLSEXT_TYPE_server_name,
80- @@ -199,15 +201,20 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
80+ @@ -199,6 +201,8 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
8181 if (len + 2 > rem)
8282 return nullptr;
8383 return reinterpret_cast<const char*>(buf + 5);
@@ -86,22 +86,18 @@ index 3517c39ad0b71a4d3efefeee2a3d55b70494bc1d..7164e539880e6d33ee1ea1fb77bae8ad
8686 }
8787
8888 const char* GetServerName(SSL* ssl) {
89- return SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
89+ @@ -206,7 +210,10 @@ const char* GetServerName(SSL* ssl) {
9090 }
9191
92- - bool SetGroups(SecureContext* sc, const char* groups) {
93- - return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
94- - }
95- + bool SetGroups(SecureContext* sc, const char* groups) {
92+ bool SetGroups(SecureContext* sc, const char* groups) {
9693+ #ifndef OPENSSL_IS_BORINGSSL
97- + return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
94+ return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
9895+ #endif
9996+ return SSL_CTX_set1_curves_list(sc->ctx().get(), groups) == 1;
100- + }
97+ }
10198
102- const char* X509ErrorCode(long err) { // NOLINT(runtime/int)
103- const char* code = "UNSPECIFIED";
104- @@ -1042,14 +1049,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
99+ // When adding or removing errors below, please also update the list in the API
100+ @@ -1044,14 +1051,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
105101 Environment* env,
106102 const SSLPointer& ssl) {
107103 EscapableHandleScope scope(env->isolate());
@@ -375,7 +371,7 @@ index 5734d8fdc5505e1586f571c19b840bd56e9c9f1f..3034b114e081e2b32dd5b71653927a41
375371 } // namespace
376372
377373diff --git a/src/env.h b/src/env.h
378- index 904dda4caf9695acec72bd95ba235b92b07eabe2..c0c99456471788d40218152291a32db5fbdf1101 100644
374+ index 3b3724d6c7156b87555be31470e75b1cf28b5e3f..910c69b6d1d17ef25201dbb39d3d074f4f3f011f 100644
379375--- a/src/env.h
380376+++ b/src/env.h
381377@@ -49,7 +49,7 @@
@@ -387,7 +383,7 @@ index 904dda4caf9695acec72bd95ba235b92b07eabe2..c0c99456471788d40218152291a32db5
387383 #include <openssl/evp.h>
388384 #endif
389385
390- @@ -1035 ,7 +1035 ,7 @@ class Environment : public MemoryRetainer {
386+ @@ -1036 ,7 +1036 ,7 @@ class Environment : public MemoryRetainer {
391387 kExitInfoFieldCount
392388 };
393389
@@ -423,7 +419,7 @@ index cf051585e779e2b03bd7b95fe5008b89cc7f8162..9de49c6828468fdf846dcd4ad445390f
423419 #if NODE_OPENSSL_HAS_QUIC
424420 #include <openssl/quic.h>
425421diff --git a/src/node_options.cc b/src/node_options.cc
426- index 937ce44696175dc80edabcd9fc2709a6716d1a66..dae3237abc95362db81a1f529becfac43454d709 100644
422+ index 7110b4d984b72fa8c9bef2cbe6e37b1871e14d08..753311e15f161547be4277016efe11cc57d351db 100644
427423--- a/src/node_options.cc
428424+++ b/src/node_options.cc
429425@@ -6,7 +6,7 @@
@@ -436,7 +432,7 @@ index 937ce44696175dc80edabcd9fc2709a6716d1a66..dae3237abc95362db81a1f529becfac4
436432 #endif
437433
438434diff --git a/src/node_options.h b/src/node_options.h
439- index 0a2f5512f689f87b73aa582782c484f73a4ebc43..e1985f2188eec6869521aecd39d2d74d5cc1616a 100644
435+ index 3c67c3680b045786dafb8435f5b311c3f386a943..546c3979e2c8d7498aa92df4c89ee867c6485080 100644
440436--- a/src/node_options.h
441437+++ b/src/node_options.h
442438@@ -11,7 +11,7 @@
0 commit comments