Commit 72baa3ca authored by Sandrine Avakian's avatar Sandrine Avakian

Big AES patch

parent 8e7051de
......@@ -494,11 +494,11 @@ MSCryptoSuite ms_crypto_suite_build_from_name_params(const MSCryptoSuiteNamePara
if (parameters && strstr(parameters,"UNENCRYPTED_SRTP")) goto error;
if (parameters && strstr(parameters,"UNAUTHENTICATED_SRTP")) return MS_AES_128_NO_AUTH;
else return MS_AES_128_SHA1_32;
}else if ( keywordcmp ( "AES_CM_256_HMAC_SHA1_32",name ) == 0 ){
}else if ( keywordcmp ("AES_256_CM_HMAC_SHA1_32", name) == 0 ){
if (parameters && strstr(parameters,"UNENCRYPTED_SRTP")) goto error;
if (parameters && strstr(parameters,"UNAUTHENTICATED_SRTP")) goto error;
return MS_AES_256_SHA1_32;
}else if ( keywordcmp ( "AES_CM_256_HMAC_SHA1_80",name ) == 0 ){
}else if ( keywordcmp ("AES_256_CM_HMAC_SHA1_80", name) == 0 ){
if (parameters && strstr(parameters,"UNENCRYPTED_SRTP")) goto error;
if (parameters && strstr(parameters,"UNAUTHENTICATED_SRTP")) goto error;
return MS_AES_256_SHA1_80;
......@@ -529,10 +529,10 @@ int ms_crypto_suite_to_name_params(MSCryptoSuite cs, MSCryptoSuiteNameParams *pa
params->params="UNENCRYPTED_SRTP UNENCRYPTED_SRTCP";
break;
case MS_AES_256_SHA1_80:
params->name="AES_CM_256_HMAC_SHA1_80";
params->name="AES_256_CM_HMAC_SHA1_80";
break;
case MS_AES_256_SHA1_32:
params->name="AES_CM_256_HMAC_SHA1_32";
params->name= "AES_256_CM_HMAC_SHA1_32";
break;
}
if (params->name==NULL) return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment