aboutsummaryrefslogtreecommitdiff
path: root/devel/grpc130/files/patch-src_core_tsi_ssl__transport__security.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/grpc130/files/patch-src_core_tsi_ssl__transport__security.cc')
-rw-r--r--devel/grpc130/files/patch-src_core_tsi_ssl__transport__security.cc26
1 files changed, 26 insertions, 0 deletions
diff --git a/devel/grpc130/files/patch-src_core_tsi_ssl__transport__security.cc b/devel/grpc130/files/patch-src_core_tsi_ssl__transport__security.cc
new file mode 100644
index 000000000000..c0183ee78552
--- /dev/null
+++ b/devel/grpc130/files/patch-src_core_tsi_ssl__transport__security.cc
@@ -0,0 +1,26 @@
+--- src/core/tsi/ssl_transport_security.cc.orig 2020-12-01 19:24:28 UTC
++++ src/core/tsi/ssl_transport_security.cc
+@@ -70,11 +70,10 @@ extern "C" {
+ #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024
+ #define TSI_SSL_HANDSHAKER_OUTGOING_BUFFER_INITIAL_SIZE 1024
+
+-/* Putting a macro like this and littering the source file with #if is really
+- bad practice.
+- TODO(jboeuf): refactor all the #if / #endif in a separate module. */
+-#ifndef TSI_OPENSSL_ALPN_SUPPORT
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+ #define TSI_OPENSSL_ALPN_SUPPORT 1
++#else
++#define TSI_OPENSSL_ALPN_SUPPORT 0
+ #endif
+
+ /* TODO(jboeuf): I have not found a way to get this number dynamically from the
+@@ -1930,7 +1929,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory_wi
+ options->cipher_suites);
+ if (result != TSI_OK) break;
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000
++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ // X509_STORE_up_ref is only available since OpenSSL 1.1.
+ if (options->root_store != nullptr) {
+ X509_STORE_up_ref(options->root_store->store);