gentoo auto-resync : 16:10:2022 - 01:51:50

4 files changed, 0 insertions, 65 deletions

diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 35fc88602ecf..dc2515d58d04 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -2,9 +2,6 @@ AUX libsrtp-1.6.0-openssl-1.1.patch 11366 BLAKE2B ab8d7dfc2c5de1a3b49eea5ed76c9b
 AUX libsrtp-1.6.0-openssl-aem_gcm-key.patch 2704 BLAKE2B 686530bce1ba56f96fa6df4606e7133aa38df0f68e3636c7c599da54371383bc64dcb63baf7404b9744ec3bcf3f3548a4877edee1ab4be699f40ad37f10468af SHA512 f0b6156494c2c8f0c3dd78142203bc15ec52f3176e01dbed74cad5302b49dc3e146cd75a4fdaff30a83ea3b8498c1e147f0c820533f362af0a2b8599087ff837
 AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657bcaf8a8c4ed77e2a4f738f72119f64825865c8820adb8ea2675695d8ce1b021dc61cdd6f478ec76fc97d9c9942178e63c1d578dc80 SHA512 561ce042f2216cdee8926f3931407116294aeed170297bf325fde02cda86a43d71aab538f2b54b2b7727a02629903c9aaf36cfe84dc6a2e4cda9388047519842
 AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0
-AUX libsrtp-2.3.0-gcc-10.patch 752 BLAKE2B 6d401cbbc0c57487183390293b54c572dc3d263b94c6edd66be5986d46746390160f8d3c95346b311bf00439eb826d7734568be462ac8c7eafcc5f3a8556b24b SHA512 4bce9f8b95fce4b89f8e9a2c10cead73e363dc966ec0574516b56cb3124edf49a8d00806f5d5de6cc8610140c21183350b4dec7b1225bcaa6e5592250293cd40
-AUX libsrtp-2.3.0-nss.patch 431 BLAKE2B f56fcf59fd43618b76fca02873b57a9bd073cc67cafe9797b58702379f01e825ba4f3391f62cab9e4a1173b66c55bdea82bfb5e108bd8f68af1b0a29fe6fdafb SHA512 0e54f320a8fc4c27ad5ac40bad07c45a3f75b01ba375aa07a1c35804ba73c1f3cd4b830b6626bff128e59d6f69433bc80028eac55cc4038db25874fde882c53d
-AUX libsrtp-2.3.0-rtp-header.patch 904 BLAKE2B f2756956a913e6be8c49d0d178f2351cb3ac634523979f47add96814d9514c7b2c4343f9302d4f24f0e75cd543aee9c587552b3cb415ceca32403d51c8550036 SHA512 e2e9dea744f6cc41a4351a443e2712b9471ffb1df0f69c41e99e562d896db3c4b29bd684352334b31a03de61a18154ac9d7fb94ab40192a5058cfa2574b81711
 AUX libsrtp-2.4.2-doc.patch 1819 BLAKE2B bc4c53bc623f839e8069b24d8bee6a5e6e52f37783ee66afc9f2f72f325c7fcbb0f9fbdff4d460953050c196a3e2d3531b009c463ba9fca50c18027146f15661 SHA512 4bbb557ad7aa93842a8003084297277a67853fc6c408fb00ce52828a05abc3c2fe726ffebedbad939a15fab6838c08f364de772e4ab9b6037b03f4d2805a5802
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch
deleted file mode 100644
index 67d4ad86d516..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c
-index 001584c..4fcb396 100644
---- a/crypto/math/datatypes.c
-+++ b/crypto/math/datatypes.c
-@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
- 
- /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
- 
--char bit_string[MAX_PRINT_STRING_LEN];
-+static char bit_string[MAX_PRINT_STRING_LEN];
- 
- uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
- {
-diff --git a/test/util.c b/test/util.c
-index 2abc28e..c0f7614 100644
---- a/test/util.c
-+++ b/test/util.c
-@@ -49,7 +49,7 @@
- #include <stdint.h>
- 
- /* include space for null terminator */
--char bit_string[MAX_PRINT_STRING_LEN + 1];
-+static char bit_string[MAX_PRINT_STRING_LEN + 1];
- 
- static inline int hex_char_to_nibble(uint8_t c)
- {
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch
deleted file mode 100644
index 6f71839e69da..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/crypto/cipher/aes_gcm_nss.c b/crypto/cipher/aes_gcm_nss.c
-index 54547cd..ecbba64 100644
---- a/crypto/cipher/aes_gcm_nss.c
-+++ b/crypto/cipher/aes_gcm_nss.c
-@@ -284,6 +284,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv,
- 
-     c->params.pIv = c->iv;
-     c->params.ulIvLen = GCM_IV_LEN;
-+    c->params.ulIvBits = 8 * GCM_IV_LEN;
-     c->params.pAAD = c->aad;
-     c->params.ulAADLen = c->aad_size;
- 
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch
deleted file mode 100644
index 096b19e8f344..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001
-From: Lennart Grahl <lennart.grahl@gmail.com>
-Date: Mon, 18 May 2020 18:01:08 +0200
-Subject: [PATCH] Fix two-byte RTP header extension encryption
-
-Also ignores the application bits as required by RFC 8285, sec 4.3
-Fixes #490
----
- srtp/srtp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/srtp/srtp.c b/srtp/srtp.c
-index b45cee0f..176b01f0 100644
---- a/srtp/srtp.c
-+++ b/srtp/srtp.c
-@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption(
-                 xtn_hdr_data++;
-             }
-         }
--    } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) {
-+    } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) {
-         /* RFC 5285, section 4.3. Two-Byte Header */
-         while (xtn_hdr_data + 1 < xtn_hdr_end) {
-             uint8_t xid = *xtn_hdr_data;