[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/

[Sam James]

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;
 +

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/

[Conrad Kostecki]

commit:     c5627b516bf8c355a5d652678ec5bf80471654fb
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 15 08:01:55 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5627b51

net-libs/libsrtp: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27794
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch  | 26 ----------------------
 net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch     | 12 ----------
 .../libsrtp/files/libsrtp-2.3.0-rtp-header.patch   | 24 --------------------
 3 files changed, 62 deletions(-)

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;

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/

[Bernard Cafarelli]

commit:     32e94754f2f511a46400d82a47aded29176cb9f3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug  7 19:40:57 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 08:31:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e94754

net-libs/libsrtp: remove unused patch

Closes: https://bugs.gentoo.org/664046
Closes: https://github.com/gentoo/gentoo/pull/9496
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch
deleted file mode 100644
index b29fa1ba4f9..00000000000
--- a/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr libsrtp-2.1.0.ORIG/configure.in libsrtp-2.1.0/configure.in
---- libsrtp-2.1.0.ORIG/configure.in	2017-09-18 23:53:18.241631991 +0100
-+++ libsrtp-2.1.0/configure.in	2017-09-18 23:55:30.077635461 +0100
-@@ -272,10 +272,13 @@
- AC_SUBST([HMAC_OBJS])
- 
- dnl Checking for PCAP
-+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)]))
-+AS_IF([test "x$enable_pcap" != "xno"], [
- AC_CHECK_LIB([pcap], [pcap_create],
-   [LIBS="-lpcap $LIBS"
-    AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `pcap' library (-lpcap)])
-    AC_SUBST([HAVE_PCAP], [1])])
-+])
- 
- AC_MSG_CHECKING([whether to redirect logging to stdout])
- AC_ARG_ENABLE([log-stdout],

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/

[Aaron Bauman]

commit:     f1c10ce60a121746d17c1da1e8fbea377db40085
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 28 07:39:46 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May  5 01:20:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c10ce6

net-libs/libsrtp: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/8187

 .../files/libsrtp-1.4.4-invalid-index.patch        | 11 -----
 net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch  | 52 --------------------
 .../files/libsrtp-1.4.4_p20121108-shared.patch     | 55 ----------------------
 net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch  | 19 --------
 .../files/libsrtp-1.5.2-fix-make-install.patch     | 13 -----
 net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff  | 46 ------------------
 6 files changed, 196 deletions(-)

diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch
deleted file mode 100644
index 90a8f019fd4..00000000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- srtp/crypto/replay/rdb.c.orig	2012-03-20 14:52:32.890017830 +0100
-+++ srtp/crypto/replay/rdb.c	2012-03-20 14:56:31.670017835 +0100
-@@ -115,7 +115,7 @@
- 
-     /* shift the window forward by delta bits*/
-     v128_left_shift(&rdb->bitmask, delta);
--    v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-delta);
-+    v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-1);
-     rdb->window_start += delta;
- 
-   }    

diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
deleted file mode 100644
index 43b8843603c..00000000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- srtp/Makefile.in
-+++ srtp/Makefile.in
-@@ -65,11 +65,11 @@
- 
- 
- # implicit rules for object files and test apps
- 
- %.o: %.c
--	$(COMPILE) -c $< -o $@
-+	$(COMPILE) -fPIC -c $< -o $@
- 
- %$(EXE): %.c
- 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
- 
- 
-@@ -103,10 +103,16 @@
- 
- libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
- 	ar cr libsrtp.a $^
- 	$(RANLIB) libsrtp.a
- 
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.1 -o libsrtp.so.1.0  $^
-+
-+libsrtp.dylib: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -dynamiclib -install_name $(libdir)/libsrtp.1.dylib -o libsrtp.1.0.dylib  $^
-+
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
- # library is not meant to be included in production code
- 
- cryptomath = crypto/math/math.o crypto/math/gf2_8.o 
-@@ -195,10 +198,20 @@
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	cp include/*.h $(DESTDIR)$(includedir)/srtp  
- 	cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+	if [ -f libsrtp.so.1.0 ]; then \
-+		cp libsrtp.so.1.0 $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so.1; \
-+		ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so; \
-+	fi
-+	if [ -f libsrtp.1.0.dylib ]; then \
-+		cp libsrtp.1.0.dylib $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.1.dylib; \
-+		ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.dylib; \
-+	fi
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(includedir)/srtp
- 	rm -rf $(DESTDIR)$(libdir)/libsrtp.a

diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch
deleted file mode 100644
index 4e70a0ddd34..00000000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Hack build routines to compile shared library
-Author: loki_val and solar
-Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
-Last-Update: 2010-03-19
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15,7 +15,7 @@
- 
- .PHONY: all test build_table_apps
- 
--all: test 
-+all: libsrtp.so test
- 
- runtest: build_table_apps test
- 	@echo "running libsrtp test applications..."
-@@ -67,7 +67,7 @@
- # implicit rules for object files and test apps
- 
- %.o: %.c
--	$(COMPILE) -c $< -o $@
-+	$(COMPILE) -fPIC -c $< -o $@
- 
- %$(EXE): %.c
- 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-@@ -105,6 +105,9 @@
- 	ar cr libsrtp.a $^
- 	$(RANLIB) libsrtp.a
- 
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0  $^
-+
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
- # library is not meant to be included in production code
-@@ -198,6 +201,11 @@
- 	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+	if [ -f libsrtp.so.0.0 ]; then \
-+		cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \
-+		ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \
-+	fi
- 
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/srtp/*.h
-@@ -206,7 +214,7 @@
- 
- clean:
- 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
--        libcryptomath.a libsrtp.a core *.core test/core
-+        libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core
- 	for a in * */* */*/*; do			\
-               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
-         done;

diff --git a/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch b/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch
deleted file mode 100644
index 2c71faf48ba..00000000000
--- a/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1a40de2..02f090c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -252,13 +252,13 @@ libsrtpdoc:
- install:
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
--	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp  
- 	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
- 	if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi
- 	if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
-+		$(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \
- 		cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
- 		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
- 	fi

diff --git a/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch b/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch
deleted file mode 100644
index f3f1f0e5c1a..00000000000
--- a/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 002d25d..1a40de2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -260,7 +260,7 @@ install:
- 	if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi
- 	if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
- 		cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
--		cp libsrtp.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \
-+		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
- 	fi
- 	if [ "$(pkgconfig_DATA)" != "" ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \

diff --git a/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff b/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff
deleted file mode 100644
index dcafe177638..00000000000
--- a/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/srtp/srtp.c b/srtp/srtp.c
-index 839c1ee..7fd19e6 100644
---- a/srtp/srtp.c
-+++ b/srtp/srtp.c
-@@ -2063,23 +2063,18 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
-   switch(profile) {
-   case srtp_profile_aes128_cm_sha1_80:
-     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
--    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes128_cm_sha1_32:
-     crypto_policy_set_aes_cm_128_hmac_sha1_32(policy);
--    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_null_sha1_80:
-     crypto_policy_set_null_cipher_hmac_sha1_80(policy);
--    crypto_policy_set_null_cipher_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes256_cm_sha1_80:
-     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
--    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes256_cm_sha1_32:
-     crypto_policy_set_aes_cm_256_hmac_sha1_32(policy);
--    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-     /* the following profiles are not (yet) supported */
-   case srtp_profile_null_sha1_32:
-@@ -2100,6 +2095,8 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
-     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes128_cm_sha1_32:
-+    /* We do not honor the 32-bit auth tag request since
-+     * this is not compliant with RFC 3711 */
-     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_null_sha1_80:
-@@ -2109,6 +2106,8 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
-     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes256_cm_sha1_32:
-+    /* We do not honor the 32-bit auth tag request since
-+     * this is not compliant with RFC 3711 */
-     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-     /* the following profiles are not (yet) supported */