From owner-svn-ports-head@freebsd.org Mon Apr 16 08:03:31 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44CE7F9338F; Mon, 16 Apr 2018 08:03:31 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED3337CEF1; Mon, 16 Apr 2018 08:03:30 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E83FD1AA9A; Mon, 16 Apr 2018 08:03:30 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3G83Ujs046473; Mon, 16 Apr 2018 08:03:30 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3G83UQT046471; Mon, 16 Apr 2018 08:03:30 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201804160803.w3G83UQT046471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 16 Apr 2018 08:03:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467465 - head/devel/grpc/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/grpc/files X-SVN-Commit-Revision: 467465 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 08:03:31 -0000 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);