diff options
| author | Pascal Bühler <pabuhler@cisco.com> | 2017-02-22 23:21:54 +0100 |
|---|---|---|
| committer | Pascal Bühler <pabuhler@cisco.com> | 2017-02-22 23:33:05 +0100 |
| commit | 796e008c0a52c855ce4cfb165b9dba8805feea66 (patch) | |
| tree | ce061fb9bd9b437ed38f9afdc03785bbc70a8854 /srtp | |
| parent | 97ba0215f88d44cba8407b25814d0f476a719acc (diff) | |
| download | libsrtp2-796e008c0a52c855ce4cfb165b9dba8805feea66.tar.gz | |
Revert code style as requested in #188 & #185
Diffstat (limited to 'srtp')
| -rw-r--r-- | srtp/srtp.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/srtp/srtp.c b/srtp/srtp.c index 27a7d0f..8ebf9e6 100644 --- a/srtp/srtp.c +++ b/srtp/srtp.c @@ -4195,15 +4195,23 @@ srtp_profile_get_master_key_length(srtp_profile_t profile) { switch(profile) { case srtp_profile_aes128_cm_sha1_80: + return 16; + break; case srtp_profile_aes128_cm_sha1_32: - case srtp_profile_aead_aes_128_gcm: return 16; break; case srtp_profile_null_sha1_80: return 16; break; case srtp_profile_aes256_cm_sha1_80: + return 32; + break; case srtp_profile_aes256_cm_sha1_32: + return 32; + break; + case srtp_profile_aead_aes_128_gcm: + return 16; + break; case srtp_profile_aead_aes_256_gcm: return 32; break; @@ -4219,13 +4227,23 @@ srtp_profile_get_master_salt_length(srtp_profile_t profile) { switch(profile) { case srtp_profile_aes128_cm_sha1_80: + return 14; + break; case srtp_profile_aes128_cm_sha1_32: + return 14; + break; case srtp_profile_null_sha1_80: + return 14; + break; case srtp_profile_aes256_cm_sha1_80: + return 14; + break; case srtp_profile_aes256_cm_sha1_32: return 14; break; case srtp_profile_aead_aes_128_gcm: + return 12; + break; case srtp_profile_aead_aes_256_gcm: return 12; break; |