Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libnice/files/
Date: Mon, 03 May 2021 18:46:41
Message-Id: 1620067547.00e84511d640676a439ed9d07bc7c3e1ec1c6dd1.sam@gentoo
1 commit: 00e84511d640676a439ed9d07bc7c3e1ec1c6dd1
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 18:37:38 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 18:45:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e84511
7
8 net-libs/libnice: drop obsolete LibreSSL patch(es)
9
10 Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../libnice/files/libnice-0.1.15-libressl.patch | 57 ----------------------
14 1 file changed, 57 deletions(-)
15
16 diff --git a/net-libs/libnice/files/libnice-0.1.15-libressl.patch b/net-libs/libnice/files/libnice-0.1.15-libressl.patch
17 deleted file mode 100644
18 index 6c38069bceb..00000000000
19 --- a/net-libs/libnice/files/libnice-0.1.15-libressl.patch
20 +++ /dev/null
21 @@ -1,57 +0,0 @@
22 -From 926afef019ca9f297cebbe13479159ac5c087f00 Mon Sep 17 00:00:00 2001
23 -From: Stefan Strogin <stefan.strogin@×××××.com>
24 -Date: Fri, 15 Feb 2019 20:45:34 +0200
25 -Subject: [PATCH] stun: Fix LibreSSL support
26 -
27 -Closes #71
28 ----
29 - stun/stunhmac.c | 12 ++++++++----
30 - 1 file changed, 8 insertions(+), 4 deletions(-)
31 -
32 -diff --git a/stun/stunhmac.c b/stun/stunhmac.c
33 -index c7d1432..c9d183f 100644
34 ---- a/stun/stunhmac.c
35 -+++ b/stun/stunhmac.c
36 -@@ -75,7 +75,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
37 - assert (ret == 1);
38 - #endif
39 -
40 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
41 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
42 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
43 - HMAC_CTX stackctx;
44 - HMAC_CTX *ctx = &stackctx;
45 - HMAC_CTX_init (ctx);
46 -@@ -101,7 +102,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
47 -
48 - TRY (HMAC_Final (ctx, sha, NULL));
49 -
50 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
51 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
52 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
53 - HMAC_CTX_cleanup (ctx);
54 - #else
55 - HMAC_CTX_free (ctx);
56 -@@ -172,7 +174,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
57 - #ifdef HAVE_OPENSSL
58 - EVP_MD_CTX *ctx;
59 -
60 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
61 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
62 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
63 - ctx = EVP_MD_CTX_create ();
64 - #else
65 - ctx = EVP_MD_CTX_new ();
66 -@@ -186,7 +189,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
67 - EVP_DigestUpdate (ctx, password_trimmed, password_len);
68 - EVP_DigestFinal_ex (ctx, md5, NULL);
69 -
70 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
71 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
72 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
73 - EVP_MD_CTX_destroy (ctx);
74 - #else
75 - EVP_MD_CTX_free (ctx);
76 ---
77 -2.20.1
78 -