mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 02:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding AES_CM_256 to deprecated crypto suite

Browse source
This commit is contained in:
Erwan Croze 2016-09-21 15:17:03 +02:00
parent 05cf0889ea
commit 56d52b8bac
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
coreapi/linphonecall.c
View file

@ -476,6 +476,7 @@ static int setup_encryption_key(SalSrtpCryptoAlgo *crypto, MSCryptoSuite suite,
keylen=30;
break;
case MS_AES_256_SHA1_80:
case MS_AES_CM_256_SHA1_80:
case MS_AES_256_SHA1_32:
keylen=46;
break;
@ -2435,10 +2436,12 @@ static void setZrtpCryptoTypesParameters(MSZrtpParams *params, LinphoneCore *lc)
params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
break;
case MS_AES_CM_256_SHA1_80:
ms_warning("Deprecated crypto suite MS_AES_CM_256_SHA1_80, use MS_AES_256_SHA1_80 instead");
case MS_AES_256_SHA1_80:
params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
break;
params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
break;
case MS_AES_256_SHA1_32:
params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS32;

2
mediastreamer2

@ -1 +1 @@
Subproject commit 3b23cf2dc42f2122a6f0a7bd7859fb2341a0f540
Subproject commit bcada9eb66cad1fe7233ca044acbe8e33ff5f5d0