commit:     dceb2fc02acc0d2d9ee2c740ca8010c066334cc6
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon Jul 11 00:20:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <orbea <AT> riseup.net>
Signed-off-by: Sam James <sam <AT> 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;
 +

Reply via email to