Date: Mon, 16 Apr 2018 08:03:30 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467465 - head/devel/grpc/files Message-ID: <201804160803.w3G83UQT046471@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Apr 16 08:03:30 2018 New Revision: 467465 URL: https://svnweb.freebsd.org/changeset/ports/467465 Log: devel/grpc: Fix build with LibreSSL < 2.7 PR: 227542 Approved by: vanilla (maintainer) Added: head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc (contents, props changed) Modified: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc Added: head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc Mon Apr 16 08:03:30 2018 (r467465) @@ -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) || Modified: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc ============================================================================== --- head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc Mon Apr 16 07:55:42 2018 (r467464) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc Mon Apr 16 08:03:30 2018 (r467465) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804160803.w3G83UQT046471>