Skip to content

Commit 9aa457e

Browse files
committed
src: make SecureContext fields private
nodejs/node#43173
1 parent 30c7840 commit 9aa457e

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,22 @@ index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe86
5555
}
5656

5757
const char* GetServerName(SSL* ssl) {
58-
@@ -210,7 +214,10 @@ const char* GetServerName(SSL* ssl) {
58+
@@ -213,9 +213,12 @@ const char* GetServerName(SSL* ssl) {
59+
return SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
5960
}
6061

61-
bool SetGroups(SecureContext* sc, const char* groups) {
62+
-bool SetGroups(SecureContext* sc, const char* groups) {
63+
- return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
64+
-}
65+
+ bool SetGroups(SecureContext* sc, const char* groups) {
6266
+#ifndef OPENSSL_IS_BORINGSSL
63-
return SSL_CTX_set1_groups_list(**sc, groups) == 1;
67+
+ return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
6468
+#endif
65-
+ return SSL_CTX_set1_curves_list(**sc, groups) == 1;
66-
}
69+
+ return SSL_CTX_set1_curves_list(sc->ctx().get(), groups) == 1;
70+
+ }
6771

6872
const char* X509ErrorCode(long err) { // NOLINT(runtime/int)
73+
const char* code = "UNSPECIFIED";
6974
@@ -1101,14 +1108,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
7075
Environment* env,
7176
const SSLPointer& ssl) {

0 commit comments

Comments
 (0)