From 09c43fdc1a23a58d33dffc9a6005c99f76c419bd Mon Sep 17 00:00:00 2001 From: Alexander Traud Date: Mon, 12 Mar 2018 10:22:43 +0100 Subject: [PATCH] res_srtp: Add support for libsrtp2.x on openSUSE. Since ASTERISK-26976, libSRTP 2.x can be used for sRTP. However, that change added a private header which is not available on openSUSE for example. To remain compatibility with very old libSRTP versions, the affected/missing symbols AES_128_ICM and HMAC_SHA1 are defined manually. ASTERISK-27733 Change-Id: I25c5cb8fa966043d1506ebef449e5a724412b4b6 --- res/res_srtp.c | 1 - res/srtp/srtp_compat.h | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/res/res_srtp.c b/res/res_srtp.c index 773d533166..f3f8999c69 100644 --- a/res/res_srtp.c +++ b/res/res_srtp.c @@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #if HAVE_SRTP_VERSION > 1 # include -# include # include "srtp/srtp_compat.h" # include #else diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h index bf42082445..a7f94c6890 100644 --- a/res/srtp/srtp_compat.h +++ b/res/srtp/srtp_compat.h @@ -5,12 +5,8 @@ #define crypto_policy_t srtp_crypto_policy_t -#if defined(SRTP_AES_ICM_128) -#define AES_128_ICM SRTP_AES_ICM_128 -#else -#define AES_128_ICM SRTP_AES_ICM -#endif -#define HMAC_SHA1 SRTP_HMAC_SHA1 +#define AES_128_ICM 1 +#define HMAC_SHA1 3 #define err_status_t srtp_err_status_t #define err_status_ok srtp_err_status_ok -- 2.47.2