From 034cc387c376bd8f6f0a7fa404f0a6a1cad23c25 Mon Sep 17 00:00:00 2001
From: "Alfred E. Heggestad" <114750+alfredh@users.noreply.github.com>
Date: Thu, 16 May 2024 11:07:09 +0200
Subject: [PATCH] tls: always enable USE_OPENSSL_SRTP (#1122)

---
 cmake/re-config.cmake |  1 -
 src/tls/openssl/tls.c | 18 ------------------
 2 files changed, 19 deletions(-)

diff --git a/cmake/re-config.cmake b/cmake/re-config.cmake
index 68c0c80cd..426a79db4 100644
--- a/cmake/re-config.cmake
+++ b/cmake/re-config.cmake
@@ -163,7 +163,6 @@ if(USE_OPENSSL)
     USE_OPENSSL
     USE_OPENSSL_AES
     USE_OPENSSL_HMAC
-    USE_OPENSSL_SRTP
     USE_TLS
   )
 endif()
diff --git a/src/tls/openssl/tls.c b/src/tls/openssl/tls.c
index 1d9fb50cb..f3d111ceb 100644
--- a/src/tls/openssl/tls.c
+++ b/src/tls/openssl/tls.c
@@ -1089,7 +1089,6 @@ int tls_set_verify_client_handler(struct tls_conn *tc, int depth,
  */
 int tls_set_srtp(struct tls *tls, const char *suites)
 {
-#ifdef USE_OPENSSL_SRTP
 	if (!tls || !suites)
 		return EINVAL;
 
@@ -1099,12 +1098,6 @@ int tls_set_srtp(struct tls *tls, const char *suites)
 	}
 
 	return 0;
-#else
-	(void)tls;
-	(void)suites;
-
-	return ENOSYS;
-#endif
 }
 
 
@@ -1265,7 +1258,6 @@ int tls_srtp_keyinfo(const struct tls_conn *tc, enum srtp_suite *suite,
 		     uint8_t *cli_key, size_t cli_key_size,
 		     uint8_t *srv_key, size_t srv_key_size)
 {
-#ifdef USE_OPENSSL_SRTP
 	static const char *label = "EXTRACTOR-dtls_srtp";
 	size_t key_size, salt_size, size;
 	SRTP_PROTECTION_PROFILE *sel;
@@ -1336,16 +1328,6 @@ int tls_srtp_keyinfo(const struct tls_conn *tc, enum srtp_suite *suite,
 	mem_secclean(keymat, sizeof(keymat));
 
 	return 0;
-#else
-	(void)tc;
-	(void)suite;
-	(void)cli_key;
-	(void)cli_key_size;
-	(void)srv_key;
-	(void)srv_key_size;
-
-	return ENOSYS;
-#endif
 }