From: Alexander Traud Date: Wed, 6 Sep 2017 08:02:19 +0000 (+0200) Subject: res_srtp: Add support for libsrtp2.1. X-Git-Tag: 14.7.0-rc1~60^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a491fb67c11fb3d7fa32ddd644c50a02c68a846b;p=thirdparty%2Fasterisk.git res_srtp: Add support for libsrtp2.1. Asterisk is able to use libSRTP 2.0.x. However since libSRTP 2.1.x, the macro SRTP_AES_ICM got renamed to SRTP_AES_ICM_128. Beside to still compile with previous versions of libSRTP, this change allows libSRTP 2.1.x as well. ASTERISK-27253 #close Change-Id: I2e6eb3c3bc844fee8a624060a2eb6f182dc70315 --- diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h index c23daabe13..56ffca1cc2 100644 --- a/res/srtp/srtp_compat.h +++ b/res/srtp/srtp_compat.h @@ -16,9 +16,6 @@ #define crypto_policy_set_aes_gcm_128_8_auth srtp_crypto_policy_set_aes_gcm_128_8_auth #define crypto_policy_set_aes_gcm_256_8_auth srtp_crypto_policy_set_aes_gcm_256_8_auth -#define AES_128_ICM SRTP_AES_ICM -#define HMAC_SHA1 SRTP_HMAC_SHA1 - #define err_status_t srtp_err_status_t #define err_status_ok srtp_err_status_ok #define err_status_fail srtp_err_status_fail