From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36F12158095 for ; Tue, 12 Jul 2022 02:45:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAF37E0DBF; Tue, 12 Jul 2022 02:45:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A546AE0DBF for ; Tue, 12 Jul 2022 02:45:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBCCA340C79 for ; Tue, 12 Jul 2022 02:45:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D92F52B for ; Tue, 12 Jul 2022 02:45:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657593941.dceb2fc02acc0d2d9ee2c740ca8010c066334cc6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch X-VCS-Directories: net-libs/libsrtp/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dceb2fc02acc0d2d9ee2c740ca8010c066334cc6 X-VCS-Branch: master Date: Tue, 12 Jul 2022 02:45:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 73b19025-5e9e-4bb8-bca1-95a4ed18633d X-Archives-Hash: 586f29fe7b517e524bfa3a455cdab32e commit: dceb2fc02acc0d2d9ee2c740ca8010c066334cc6 Author: orbea riseup net> AuthorDate: Mon Jul 11 00:20:47 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 12 02:45:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dceb2fc0 net-libs/libsrtp: Remove libressl support This removes outdated libressl checks from the openssl-1.1.patch which are no longer required for the libressl overlay. Signed-off-by: orbea riseup.net> Signed-off-by: Sam James gentoo.org> net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch index 5d17cb426e88..9ca172688b5b 100644 --- a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch +++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch @@ -217,7 +217,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f - if (pointer == NULL) { +/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t* pointer; @@ -263,7 +263,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f hmac_ctx = (HMAC_CTX*)a->state; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L HMAC_CTX_cleanup(hmac_ctx); /* zeroize entire state*/ @@ -318,7 +318,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f +/* OpenSSL 1.1.0 made EVP_MD_CTX an opaque structure, which must be allocated + using EVP_MD_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + +typedef EVP_MD_CTX sha1_ctx_t; +