Attachment 192546 Details for Bug 227542 – grpc.diff

[patch] grpc.diff

grpc.diff (text/plain), 1.80 KB, created by Tobias Kortkamp on 2018-04-16 06:08:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2018-04-16 06:08:29 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc b/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
>new file mode 100644
>index 000000000000..6eeb238fbfc0
>--- /dev/null
>+++ b/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
>@@ -0,0 +1,11 @@
>+--- src/core/tsi/alts/crypt/aes_gcm.cc.orig	2018-04-16 04:55:21 UTC
>++++ src/core/tsi/alts/crypt/aes_gcm.cc
>+@@ -185,7 +185,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_
>+                                                 const uint8_t* kdf_counter) {
>+   unsigned char buf[EVP_MAX_MD_SIZE];
>+   unsigned char ctr = 1;
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
>+   HMAC_CTX hmac;
>+   HMAC_CTX_init(&hmac);
>+   if (!HMAC_Init_ex(&hmac, kdf_key, kKdfKeyLen, EVP_sha256(), nullptr) ||
>diff --git a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
>index 135ecb7d9057..4a3b01aad43d 100644
>--- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
>+++ b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
>@@ -24,3 +24,12 @@
>  #endif
>  
>  /* TODO(jboeuf): I have not found a way to get this number dynamically from the
>+@@ -1547,7 +1546,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);

Flags:

tobik: maintainer-approval? (vanilla)

Actions: View | Diff

Attachments on bug 227542: 192546