sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename crypto suits according to RFC6188

Browse Source 
(cherry picked from commit 0c9bb7c440)
changes/76/27476/1
Alexey Vasilyev 7 years ago committed by Richard Fuchs
parent 530c02dec6
commit 333557f2df
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
daemon/crypto.c
Unescape View File

@ -85,7 +85,7 @@ struct crypto_suite __crypto_suites[] = {
.session_key_cleanup = evp_session_key_cleanup,
},
{
.name = "AES_CM_192_HMAC_SHA1_80",
.name = "AES_192_CM_HMAC_SHA1_80",
//.dtls_name = "SRTP_AES128_CM_SHA1_80",
.master_key_len = 24,
.master_salt_len = 14,
@ -109,7 +109,7 @@ struct crypto_suite __crypto_suites[] = {
.session_key_cleanup = evp_session_key_cleanup,
},
{
.name = "AES_CM_192_HMAC_SHA1_32",
.name = "AES_192_CM_HMAC_SHA1_32",
//.dtls_name = "SRTP_AES128_CM_SHA1_32",
.master_key_len = 24,
.master_salt_len = 14,
@ -133,7 +133,7 @@ struct crypto_suite __crypto_suites[] = {
.session_key_cleanup = evp_session_key_cleanup,
},
{
.name = "AES_CM_256_HMAC_SHA1_80",
.name = "AES_256_CM_HMAC_SHA1_80",
//.dtls_name = "SRTP_AES128_CM_SHA1_80",
.master_key_len = 32,
.master_salt_len = 14,
@ -157,7 +157,7 @@ struct crypto_suite __crypto_suites[] = {
.session_key_cleanup = evp_session_key_cleanup,
},
{
.name = "AES_CM_256_HMAC_SHA1_32",
.name = "AES_256_CM_HMAC_SHA1_32",
//.dtls_name = "SRTP_AES128_CM_SHA1_32",
.master_key_len = 32,
.master_salt_len = 14,

8
perl/NGCP/Rtpclient/SRTP.pm
Unescape View File

@ -39,7 +39,7 @@ our @crypto_suites = (
salt_length => 14,
},
{
str => 'AES_CM_192_HMAC_SHA1_80',
str => 'AES_192_CM_HMAC_SHA1_80',
#dtls_name => 'SRTP_AES128_CM_SHA1_80',
auth_tag => 10,
enc_func => \&aes_cm,
@ -49,7 +49,7 @@ our @crypto_suites = (
salt_length => 14,
},
{
str => 'AES_CM_256_HMAC_SHA1_80',
str => 'AES_256_CM_HMAC_SHA1_80',
#dtls_name => 'SRTP_AES128_CM_SHA1_80',
auth_tag => 10,
enc_func => \&aes_cm,
@ -59,7 +59,7 @@ our @crypto_suites = (
salt_length => 14,
},
{
str => 'AES_CM_192_HMAC_SHA1_32',
str => 'AES_192_CM_HMAC_SHA1_32',
#dtls_name => 'SRTP_AES128_CM_SHA1_80',
auth_tag => 4,
enc_func => \&aes_cm,
@ -69,7 +69,7 @@ our @crypto_suites = (
salt_length => 14,
},
{
str => 'AES_CM_256_HMAC_SHA1_32',
str => 'AES_256_CM_HMAC_SHA1_32',
#dtls_name => 'SRTP_AES128_CM_SHA1_80',
auth_tag => 4,
enc_func => \&aes_cm,

4
t/aes-crypt.c
Unescape View File

@ -227,7 +227,7 @@ int main(int argc, char** argv) {
srtp_validate(&ctx, &ctx2, "SRTP AES-CM-128", rtp_plaintext_ref, srtp_ciphertext_128,
rtcp_plaintext_ref, srtcp_ciphertext_128);
str_init(&suite, "AES_CM_192_HMAC_SHA1_80");
str_init(&suite, "AES_192_CM_HMAC_SHA1_80");
c = crypto_find_suite(&suite);
assert(c);
@ -250,7 +250,7 @@ int main(int argc, char** argv) {
srtp_validate(&ctx, &ctx2, "SRTP AES-CM-192", rtp_plaintext_ref, srtp_ciphertext_192,
rtcp_plaintext_ref, srtcp_ciphertext_192);
str_init(&suite, "AES_CM_256_HMAC_SHA1_80");
str_init(&suite, "AES_256_CM_HMAC_SHA1_80");
c = crypto_find_suite(&suite);
assert(c);

Write Preview
Loading…
Cancel
Save