mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: update false to use analogous function in SetGroups (#31325)

Browse source
This commit is contained in:
Shelley Vohr 2021-10-11 03:02:26 +02:00 • committed by GitHub
parent 0eb9c4b16d
commit f45bd693f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
View file

@ -17,7 +17,7 @@ Upstreams:
- https://github.com/nodejs/node/pull/39136 - https://github.com/nodejs/node/pull/39136
diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
index f4b7bd3ad8548a0b69943ddea669e6f1991b7a49..221d652fa7de246e5f69fcf392e334087bac0199 100644 index f4b7bd3ad8548a0b69943ddea669e6f1991b7a49..dc4f6737d7709fda9bb1350a0d3ed342d83b7044 100644
--- a/src/crypto/crypto_common.cc --- a/src/crypto/crypto_common.cc
+++ b/src/crypto/crypto_common.cc +++ b/src/crypto/crypto_common.cc
@@ -242,7 +242,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) { @@ -242,7 +242,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
@ -62,7 +62,7 @@ index f4b7bd3ad8548a0b69943ddea669e6f1991b7a49..221d652fa7de246e5f69fcf392e33408
+#ifndef OPENSSL_IS_BORINGSSL +#ifndef OPENSSL_IS_BORINGSSL
return SSL_CTX_set1_groups_list(**sc, groups) == 1; return SSL_CTX_set1_groups_list(**sc, groups) == 1;
+#endif +#endif
+ return false; + return SSL_CTX_set1_curves_list(**sc, groups) == 1;
} }
const char* X509ErrorCode(long err) { // NOLINT(runtime/int) const char* X509ErrorCode(long err) { // NOLINT(runtime/int)