From d3872b3a7b129971cca9b52b54fd8441adf723ea Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 11 Jan 2014 03:46:13 +0500 Subject: [PATCH] add diffs from 8884f4d 8e47faf @ https://github.com/cisco/libsrtp --- libs/srtp/srtp/srtp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/srtp/srtp/srtp.c b/libs/srtp/srtp/srtp.c index a1f1fc8327..2f4b88fc21 100644 --- a/libs/srtp/srtp/srtp.c +++ b/libs/srtp/srtp/srtp.c @@ -2052,24 +2052,19 @@ crypto_policy_set_from_profile_for_rtp(crypto_policy_t *policy, /* set SRTP policy from the SRTP profile in the key set */ 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: @@ -2090,7 +2085,7 @@ crypto_policy_set_from_profile_for_rtcp(crypto_policy_t *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_80(policy); + crypto_policy_set_aes_cm_128_hmac_sha1_32(policy); break; case srtp_profile_null_sha1_80: crypto_policy_set_null_cipher_hmac_sha1_80(policy); @@ -2099,7 +2094,7 @@ crypto_policy_set_from_profile_for_rtcp(crypto_policy_t *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_80(policy); + crypto_policy_set_aes_cm_256_hmac_sha1_32(policy); break; /* the following profiles are not (yet) supported */ case srtp_profile_null_sha1_32: