Date: Fri, 28 Jan 2022 23:29:35 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d76ea52354cb - main - devel/grpc: Clean up outdated patches Message-ID: <202201282329.20SNTZ8b096262@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d76ea52354cb9db13e8b83af7ac72298e5790ca7 commit d76ea52354cb9db13e8b83af7ac72298e5790ca7 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-01-28 23:24:01 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-01-28 23:27:02 +0000 devel/grpc: Clean up outdated patches --- ...e_lib_security_credentials_jwt_jwt__verifier.cc | 11 --------- .../patch-src_core_tsi_alts_crypt_aes__gcm.cc | 11 --------- .../patch-src_core_tsi_ssl__transport__security.cc | 26 ---------------------- 3 files changed, 48 deletions(-) diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc deleted file mode 100644 index d68a3c9ce37f..000000000000 --- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2020-12-01 19:24:28 UTC -+++ src/core/lib/security/credentials/jwt/jwt_verifier.cc -@@ -472,7 +472,7 @@ static BIGNUM* bignum_from_base64(const char* b64) { - return result; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - // Provide compatibility across OpenSSL 1.02 and 1.1. - static int RSA_set0_key(RSA* r, BIGNUM* n, BIGNUM* e, BIGNUM* d) { 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 deleted file mode 100644 index c14ba4026b09..000000000000 --- a/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2020-12-01 19:24:28 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 deleted file mode 100644 index c0183ee78552..000000000000 --- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201282329.20SNTZ8b096262>