Merge "res_srtp: Add support for libsrtp2.x on openSUSE." into 13

9 years ago · acf3bdc3d5
parent d13ef8c974 09c43fdc1a
commit acf3bdc3d5
2 changed files with 2 additions and 7 deletions
--- 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 <srtp2/srtp.h>
-# include <srtp2/crypto_types.h>
 # include "srtp/srtp_compat.h"
 # include <openssl/rand.h>
 #else
--- 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