From b8a2f015ad57be93a1019447febf8425cf90946c Mon Sep 17 00:00:00 2001 From: Anthony Alba Date: Fri, 17 Mar 2017 20:59:22 -1000 Subject: [PATCH 1/3] Initial support for AES-192, AES-256 in userspace --- daemon/crypto.c | 129 +++++++++++++++++++++++++++++++++++++++++++++--- daemon/crypto.h | 4 +- daemon/sdp.c | 10 ++-- 3 files changed, 130 insertions(+), 13 deletions(-) diff --git a/daemon/crypto.c b/daemon/crypto.c index e70949eb7..e75443828 100644 --- a/daemon/crypto.c +++ b/daemon/crypto.c @@ -84,6 +84,102 @@ const struct crypto_suite crypto_suites[] = { .session_key_init = aes_cm_session_key_init, .session_key_cleanup = evp_session_key_cleanup, }, + { + .name = "AES_CM_192_HMAC_SHA1_80", + //.dtls_name = "SRTP_AES128_CM_SHA1_80", + .master_key_len = 24, + .master_salt_len = 14, + .session_key_len = 24, + .session_salt_len = 14, + .srtp_lifetime = 1ULL << 48, + .srtcp_lifetime = 1ULL << 31, + //.kernel_cipher = REC_AES_CM, + //.kernel_hmac = REH_HMAC_SHA1, + .srtp_auth_tag = 10, + .srtcp_auth_tag = 10, + .srtp_auth_key_len = 20, + .srtcp_auth_key_len = 20, + .encrypt_rtp = aes_cm_encrypt_rtp, + .decrypt_rtp = aes_cm_encrypt_rtp, + .encrypt_rtcp = aes_cm_encrypt_rtcp, + .decrypt_rtcp = aes_cm_encrypt_rtcp, + .hash_rtp = hmac_sha1_rtp, + .hash_rtcp = hmac_sha1_rtcp, + .session_key_init = aes_cm_session_key_init, + .session_key_cleanup = evp_session_key_cleanup, + }, + { + .name = "AES_CM_192_HMAC_SHA1_32", + //.dtls_name = "SRTP_AES128_CM_SHA1_32", + .master_key_len = 24, + .master_salt_len = 14, + .session_key_len = 24, + .session_salt_len = 14, + .srtp_lifetime = 1ULL << 48, + .srtcp_lifetime = 1ULL << 31, + //.kernel_cipher = REC_AES_CM, + //.kernel_hmac = REH_HMAC_SHA1, + .srtp_auth_tag = 4, + .srtcp_auth_tag = 10, + .srtp_auth_key_len = 20, + .srtcp_auth_key_len = 20, + .encrypt_rtp = aes_cm_encrypt_rtp, + .decrypt_rtp = aes_cm_encrypt_rtp, + .encrypt_rtcp = aes_cm_encrypt_rtcp, + .decrypt_rtcp = aes_cm_encrypt_rtcp, + .hash_rtp = hmac_sha1_rtp, + .hash_rtcp = hmac_sha1_rtcp, + .session_key_init = aes_cm_session_key_init, + .session_key_cleanup = evp_session_key_cleanup, + }, + { + .name = "AES_CM_256_HMAC_SHA1_80", + //.dtls_name = "SRTP_AES128_CM_SHA1_80", + .master_key_len = 32, + .master_salt_len = 14, + .session_key_len = 32, + .session_salt_len = 14, + .srtp_lifetime = 1ULL << 48, + .srtcp_lifetime = 1ULL << 31, + //.kernel_cipher = REC_AES_CM, + //.kernel_hmac = REH_HMAC_SHA1, + .srtp_auth_tag = 10, + .srtcp_auth_tag = 10, + .srtp_auth_key_len = 20, + .srtcp_auth_key_len = 20, + .encrypt_rtp = aes_cm_encrypt_rtp, + .decrypt_rtp = aes_cm_encrypt_rtp, + .encrypt_rtcp = aes_cm_encrypt_rtcp, + .decrypt_rtcp = aes_cm_encrypt_rtcp, + .hash_rtp = hmac_sha1_rtp, + .hash_rtcp = hmac_sha1_rtcp, + .session_key_init = aes_cm_session_key_init, + .session_key_cleanup = evp_session_key_cleanup, + }, + { + .name = "AES_CM_256_HMAC_SHA1_32", + //.dtls_name = "SRTP_AES128_CM_SHA1_32", + .master_key_len = 32, + .master_salt_len = 14, + .session_key_len = 32, + .session_salt_len = 14, + .srtp_lifetime = 1ULL << 48, + .srtcp_lifetime = 1ULL << 31, + //.kernel_cipher = REC_AES_CM, + //.kernel_hmac = REH_HMAC_SHA1, + .srtp_auth_tag = 4, + .srtcp_auth_tag = 10, + .srtp_auth_key_len = 20, + .srtcp_auth_key_len = 20, + .encrypt_rtp = aes_cm_encrypt_rtp, + .decrypt_rtp = aes_cm_encrypt_rtp, + .encrypt_rtcp = aes_cm_encrypt_rtcp, + .decrypt_rtcp = aes_cm_encrypt_rtcp, + .hash_rtp = hmac_sha1_rtp, + .hash_rtcp = hmac_sha1_rtcp, + .session_key_init = aes_cm_session_key_init, + .session_key_cleanup = evp_session_key_cleanup, + }, { .name = "F8_128_HMAC_SHA1_80", // .dtls_name = "SRTP_AES128_F8_SHA1_80", @@ -259,10 +355,11 @@ done: ; } -static void aes_ctr_128_no_ctx(unsigned char *out, str *in, const unsigned char *key, const unsigned char *iv) { +static void aes_ctr_128_no_ctx(unsigned char *out, str *in, const unsigned char *key, int keylen, const unsigned char *iv) { EVP_CIPHER_CTX *ctx; unsigned char block[16]; int len; + EVP_CIPHER *ecb_cipher; #if OPENSSL_VERSION_NUMBER >= 0x10100000L ctx = EVP_CIPHER_CTX_new(); @@ -271,7 +368,18 @@ static void aes_ctr_128_no_ctx(unsigned char *out, str *in, const unsigned char ctx = &ctx_s; EVP_CIPHER_CTX_init(ctx); #endif - EVP_EncryptInit_ex(ctx, EVP_aes_128_ecb(), NULL, key, NULL); + switch(keylen) { + case 16: + ecb_cipher = EVP_aes_128_ecb(); + break; + case 24: + ecb_cipher = EVP_aes_192_ecb(); + break; + case 32: + ecb_cipher = EVP_aes_256_ecb(); + break; + } + EVP_EncryptInit_ex(ctx, ecb_cipher, NULL, key, NULL); aes_ctr_128(out, in, ctx, iv); EVP_EncryptFinal_ex(ctx, block, &len); @@ -287,7 +395,7 @@ static void aes_ctr_128_no_ctx(unsigned char *out, str *in, const unsigned char * x: 112 bits * n <= 256 * out->len := n / 8 */ -static void prf_n(str *out, const unsigned char *key, const unsigned char *x) { +static void prf_n(str *out, const unsigned char *key, int keylen, const unsigned char *x) { unsigned char iv[16]; unsigned char o[32]; unsigned char in[32]; @@ -300,7 +408,7 @@ static void prf_n(str *out, const unsigned char *key, const unsigned char *x) { /* iv[14] = iv[15] = 0; := x << 16 */ ZERO(in); /* outputs the key stream */ str_init_len(&in_s, (void *) in, out->len > 16 ? 32 : 16); - aes_ctr_128_no_ctx(o, &in_s, key, iv); + aes_ctr_128_no_ctx(o, &in_s, key, keylen, iv); memcpy(out->s, o, out->len); } @@ -322,7 +430,7 @@ int crypto_gen_session_key(struct crypto_context *c, str *out, unsigned char lab for (i = 13 - index_len; i < 14; i++) x[i] = key_id[i - (13 - index_len)] ^ x[i]; - prf_n(out, c->params.master_key, x); + prf_n(out, c->params.master_key, c->params.crypto_suite->master_key_len, x); #if CRYPTO_DEBUG ilog(LOG_DEBUG, "Generated session key: master key " @@ -516,6 +624,7 @@ static int hmac_sha1_rtcp(struct crypto_context *c, char *out, str *in) { } static int aes_cm_session_key_init(struct crypto_context *c) { + EVP_CIPHER * ecb_cipher; evp_session_key_cleanup(c); #if OPENSSL_VERSION_NUMBER >= 0x10100000L @@ -524,7 +633,15 @@ static int aes_cm_session_key_init(struct crypto_context *c) { c->session_key_ctx[0] = g_slice_alloc(sizeof(EVP_CIPHER_CTX)); EVP_CIPHER_CTX_init(c->session_key_ctx[0]); #endif - EVP_EncryptInit_ex(c->session_key_ctx[0], EVP_aes_128_ecb(), NULL, + switch(c->params.crypto_suite->session_key_len) { + case 16: + ecb_cipher = EVP_aes_128_ecb(); + case 24: + ecb_cipher = EVP_aes_192_ecb(); + case 32: + ecb_cipher = EVP_aes_256_ecb(); + } + EVP_EncryptInit_ex(c->session_key_ctx[0], ecb_cipher, NULL, (unsigned char *) c->session_key, NULL); return 0; } diff --git a/daemon/crypto.h b/daemon/crypto.h index b723857f4..0095697f9 100644 --- a/daemon/crypto.h +++ b/daemon/crypto.h @@ -11,9 +11,9 @@ -#define SRTP_MAX_MASTER_KEY_LEN 16 +#define SRTP_MAX_MASTER_KEY_LEN 32 #define SRTP_MAX_MASTER_SALT_LEN 14 -#define SRTP_MAX_SESSION_KEY_LEN 16 +#define SRTP_MAX_SESSION_KEY_LEN 32 #define SRTP_MAX_SESSION_SALT_LEN 14 #define SRTP_MAX_SESSION_AUTH_LEN 20 diff --git a/daemon/sdp.c b/daemon/sdp.c index 22616775a..a8a6f499f 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -1,8 +1,8 @@ #include "sdp.h" #include -#include -#include +#include +#include #include #include @@ -274,7 +274,7 @@ INLINE int extract_token(char **sp, char *end, str *out) { *sp = space + 1; } return 0; - + } #define EXTRACT_TOKEN(field) if (extract_token(&start, end, &output->field)) return -1 #define EXTRACT_NETWORK_ADDRESS_NP(field) \ @@ -978,10 +978,10 @@ int sdp_parse(str *body, GQueue *sessions) { if (line_end - value < 4) break; if (!memcmp(value, "RR:", 3)) - *(media ? &media->rr : &session->rr) = + *(media ? &media->rr : &session->rr) = (line_end - value == 4 && value[3] == '0') ? 0 : 1; else if (!memcmp(value, "RS:", 3)) - *(media ? &media->rs : &session->rs) = + *(media ? &media->rs : &session->rs) = (line_end - value == 4 && value[3] == '0') ? 0 : 1; break; From 357bb1d50fb566a5dabbdd50241c681f161a5aea Mon Sep 17 00:00:00 2001 From: Anthony Alba Date: Wed, 22 Mar 2017 12:27:49 +0800 Subject: [PATCH 2/3] Refactor to add explicit session key init functions --- daemon/crypto.c | 75 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/daemon/crypto.c b/daemon/crypto.c index e75443828..6bf6cd955 100644 --- a/daemon/crypto.c +++ b/daemon/crypto.c @@ -28,7 +28,9 @@ static int hmac_sha1_rtp(struct crypto_context *, char *out, str *in, u_int64_t) static int hmac_sha1_rtcp(struct crypto_context *, char *out, str *in); static int aes_f8_encrypt_rtp(struct crypto_context *c, struct rtp_header *r, str *s, u_int64_t idx); static int aes_f8_encrypt_rtcp(struct crypto_context *c, struct rtcp_packet *r, str *s, u_int64_t idx); -static int aes_cm_session_key_init(struct crypto_context *c); +static int aes_cm_session_key_init_128(struct crypto_context *c); +static int aes_cm_session_key_init_192(struct crypto_context *c); +static int aes_cm_session_key_init_256(struct crypto_context *c); static int aes_f8_session_key_init(struct crypto_context *c); static int evp_session_key_cleanup(struct crypto_context *c); static int null_crypt_rtp(struct crypto_context *c, struct rtp_header *r, str *s, u_int64_t idx); @@ -57,7 +59,7 @@ const struct crypto_suite crypto_suites[] = { .decrypt_rtcp = aes_cm_encrypt_rtcp, .hash_rtp = hmac_sha1_rtp, .hash_rtcp = hmac_sha1_rtcp, - .session_key_init = aes_cm_session_key_init, + .session_key_init = aes_cm_session_key_init_128, .session_key_cleanup = evp_session_key_cleanup, }, { @@ -81,7 +83,7 @@ const struct crypto_suite crypto_suites[] = { .decrypt_rtcp = aes_cm_encrypt_rtcp, .hash_rtp = hmac_sha1_rtp, .hash_rtcp = hmac_sha1_rtcp, - .session_key_init = aes_cm_session_key_init, + .session_key_init = aes_cm_session_key_init_128, .session_key_cleanup = evp_session_key_cleanup, }, { @@ -105,7 +107,7 @@ const struct crypto_suite crypto_suites[] = { .decrypt_rtcp = aes_cm_encrypt_rtcp, .hash_rtp = hmac_sha1_rtp, .hash_rtcp = hmac_sha1_rtcp, - .session_key_init = aes_cm_session_key_init, + .session_key_init = aes_cm_session_key_init_192, .session_key_cleanup = evp_session_key_cleanup, }, { @@ -129,7 +131,7 @@ const struct crypto_suite crypto_suites[] = { .decrypt_rtcp = aes_cm_encrypt_rtcp, .hash_rtp = hmac_sha1_rtp, .hash_rtcp = hmac_sha1_rtcp, - .session_key_init = aes_cm_session_key_init, + .session_key_init = aes_cm_session_key_init_192, .session_key_cleanup = evp_session_key_cleanup, }, { @@ -153,7 +155,7 @@ const struct crypto_suite crypto_suites[] = { .decrypt_rtcp = aes_cm_encrypt_rtcp, .hash_rtp = hmac_sha1_rtp, .hash_rtcp = hmac_sha1_rtcp, - .session_key_init = aes_cm_session_key_init, + .session_key_init = aes_cm_session_key_init_256, .session_key_cleanup = evp_session_key_cleanup, }, { @@ -177,7 +179,7 @@ const struct crypto_suite crypto_suites[] = { .decrypt_rtcp = aes_cm_encrypt_rtcp, .hash_rtp = hmac_sha1_rtp, .hash_rtcp = hmac_sha1_rtcp, - .session_key_init = aes_cm_session_key_init, + .session_key_init = aes_cm_session_key_init_256, .session_key_cleanup = evp_session_key_cleanup, }, { @@ -307,7 +309,7 @@ const struct crypto_suite *crypto_find_suite(const str *s) { /* rfc 3711 section 4.1 and 4.1.1 * "in" and "out" MAY point to the same buffer */ -static void aes_ctr_128(unsigned char *out, str *in, EVP_CIPHER_CTX *ecc, const unsigned char *iv) { +static void aes_ctr(unsigned char *out, str *in, EVP_CIPHER_CTX *ecc, const unsigned char *iv) { unsigned char ivx[16]; unsigned char key_block[16]; unsigned char *p, *q; @@ -355,11 +357,11 @@ done: ; } -static void aes_ctr_128_no_ctx(unsigned char *out, str *in, const unsigned char *key, int keylen, const unsigned char *iv) { +static void aes_ctr_no_ctx(unsigned char *out, str *in, const unsigned char *key, int keylen, const unsigned char *iv) { EVP_CIPHER_CTX *ctx; unsigned char block[16]; int len; - EVP_CIPHER *ecb_cipher; + const EVP_CIPHER *ecb_cipher; #if OPENSSL_VERSION_NUMBER >= 0x10100000L ctx = EVP_CIPHER_CTX_new(); @@ -378,9 +380,13 @@ static void aes_ctr_128_no_ctx(unsigned char *out, str *in, const unsigned char case 32: ecb_cipher = EVP_aes_256_ecb(); break; + default: + // silence -Wmaybe-unintialized; must not end up here + assert(FALSE); + break; } EVP_EncryptInit_ex(ctx, ecb_cipher, NULL, key, NULL); - aes_ctr_128(out, in, ctx, iv); + aes_ctr(out, in, ctx, iv); EVP_EncryptFinal_ex(ctx, block, &len); #if OPENSSL_VERSION_NUMBER >= 0x10100000L @@ -408,7 +414,7 @@ static void prf_n(str *out, const unsigned char *key, int keylen, const unsigned /* iv[14] = iv[15] = 0; := x << 16 */ ZERO(in); /* outputs the key stream */ str_init_len(&in_s, (void *) in, out->len > 16 ? 32 : 16); - aes_ctr_128_no_ctx(o, &in_s, key, keylen, iv); + aes_ctr_no_ctx(o, &in_s, key, keylen, iv); memcpy(out->s, o, out->len); } @@ -474,7 +480,7 @@ static int aes_cm_encrypt(struct crypto_context *c, u_int32_t ssrc, str *s, u_in ivi[2] ^= idxh; ivi[3] ^= idxl; - aes_ctr_128((void *) s->s, s, c->session_key_ctx[0], iv); + aes_ctr((void *) s->s, s, c->session_key_ctx[0], iv); return 0; } @@ -623,8 +629,7 @@ static int hmac_sha1_rtcp(struct crypto_context *c, char *out, str *in) { return 0; } -static int aes_cm_session_key_init(struct crypto_context *c) { - EVP_CIPHER * ecb_cipher; +static int aes_cm_session_key_init_128(struct crypto_context *c) { evp_session_key_cleanup(c); #if OPENSSL_VERSION_NUMBER >= 0x10100000L @@ -633,15 +638,35 @@ static int aes_cm_session_key_init(struct crypto_context *c) { c->session_key_ctx[0] = g_slice_alloc(sizeof(EVP_CIPHER_CTX)); EVP_CIPHER_CTX_init(c->session_key_ctx[0]); #endif - switch(c->params.crypto_suite->session_key_len) { - case 16: - ecb_cipher = EVP_aes_128_ecb(); - case 24: - ecb_cipher = EVP_aes_192_ecb(); - case 32: - ecb_cipher = EVP_aes_256_ecb(); - } - EVP_EncryptInit_ex(c->session_key_ctx[0], ecb_cipher, NULL, + EVP_EncryptInit_ex(c->session_key_ctx[0], EVP_aes_128_ecb(), NULL, + (unsigned char *) c->session_key, NULL); + return 0; +} + +static int aes_cm_session_key_init_192(struct crypto_context *c) { + evp_session_key_cleanup(c); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + c->session_key_ctx[0] = EVP_CIPHER_CTX_new(); +#else + c->session_key_ctx[0] = g_slice_alloc(sizeof(EVP_CIPHER_CTX)); + EVP_CIPHER_CTX_init(c->session_key_ctx[0]); +#endif + EVP_EncryptInit_ex(c->session_key_ctx[0], EVP_aes_192_ecb(), NULL, + (unsigned char *) c->session_key, NULL); + return 0; +} + +static int aes_cm_session_key_init_256(struct crypto_context *c) { + evp_session_key_cleanup(c); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + c->session_key_ctx[0] = EVP_CIPHER_CTX_new(); +#else + c->session_key_ctx[0] = g_slice_alloc(sizeof(EVP_CIPHER_CTX)); + EVP_CIPHER_CTX_init(c->session_key_ctx[0]); +#endif + EVP_EncryptInit_ex(c->session_key_ctx[0], EVP_aes_256_ecb(), NULL, (unsigned char *) c->session_key, NULL); return 0; } @@ -652,7 +677,7 @@ static int aes_f8_session_key_init(struct crypto_context *c) { int k_e_len, k_s_len; /* n_e, n_s */ unsigned char *key; - aes_cm_session_key_init(c); + aes_cm_session_key_init_128(c); k_e_len = c->params.crypto_suite->session_key_len; k_s_len = c->params.crypto_suite->session_salt_len; From d5cecc500fe13fbc817f59405f8276baa6dd06d2 Mon Sep 17 00:00:00 2001 From: Anthony Alba Date: Wed, 22 Mar 2017 20:55:06 +0800 Subject: [PATCH 3/3] Add AES-192, AES-256 CM to kernel SRTP --- daemon/crypto.c | 20 ++++---- daemon/media_socket.c | 2 + kernel-module/xt_RTPENGINE.c | 92 ++++++++++++++++++++++++++++++------ kernel-module/xt_RTPENGINE.h | 8 +++- 4 files changed, 95 insertions(+), 27 deletions(-) diff --git a/daemon/crypto.c b/daemon/crypto.c index 6bf6cd955..f3922178a 100644 --- a/daemon/crypto.c +++ b/daemon/crypto.c @@ -47,7 +47,7 @@ const struct crypto_suite crypto_suites[] = { .session_salt_len = 14, .srtp_lifetime = 1ULL << 48, .srtcp_lifetime = 1ULL << 31, - .kernel_cipher = REC_AES_CM, + .kernel_cipher = REC_AES_CM_128, .kernel_hmac = REH_HMAC_SHA1, .srtp_auth_tag = 10, .srtcp_auth_tag = 10, @@ -71,7 +71,7 @@ const struct crypto_suite crypto_suites[] = { .session_salt_len = 14, .srtp_lifetime = 1ULL << 48, .srtcp_lifetime = 1ULL << 31, - .kernel_cipher = REC_AES_CM, + .kernel_cipher = REC_AES_CM_128, .kernel_hmac = REH_HMAC_SHA1, .srtp_auth_tag = 4, .srtcp_auth_tag = 10, @@ -95,8 +95,8 @@ const struct crypto_suite crypto_suites[] = { .session_salt_len = 14, .srtp_lifetime = 1ULL << 48, .srtcp_lifetime = 1ULL << 31, - //.kernel_cipher = REC_AES_CM, - //.kernel_hmac = REH_HMAC_SHA1, + .kernel_cipher = REC_AES_CM_192, + .kernel_hmac = REH_HMAC_SHA1, .srtp_auth_tag = 10, .srtcp_auth_tag = 10, .srtp_auth_key_len = 20, @@ -119,8 +119,8 @@ const struct crypto_suite crypto_suites[] = { .session_salt_len = 14, .srtp_lifetime = 1ULL << 48, .srtcp_lifetime = 1ULL << 31, - //.kernel_cipher = REC_AES_CM, - //.kernel_hmac = REH_HMAC_SHA1, + .kernel_cipher = REC_AES_CM_192, + .kernel_hmac = REH_HMAC_SHA1, .srtp_auth_tag = 4, .srtcp_auth_tag = 10, .srtp_auth_key_len = 20, @@ -143,8 +143,8 @@ const struct crypto_suite crypto_suites[] = { .session_salt_len = 14, .srtp_lifetime = 1ULL << 48, .srtcp_lifetime = 1ULL << 31, - //.kernel_cipher = REC_AES_CM, - //.kernel_hmac = REH_HMAC_SHA1, + .kernel_cipher = REC_AES_CM_256, + .kernel_hmac = REH_HMAC_SHA1, .srtp_auth_tag = 10, .srtcp_auth_tag = 10, .srtp_auth_key_len = 20, @@ -167,8 +167,8 @@ const struct crypto_suite crypto_suites[] = { .session_salt_len = 14, .srtp_lifetime = 1ULL << 48, .srtcp_lifetime = 1ULL << 31, - //.kernel_cipher = REC_AES_CM, - //.kernel_hmac = REH_HMAC_SHA1, + .kernel_cipher = REC_AES_CM_256, + .kernel_hmac = REH_HMAC_SHA1, .srtp_auth_tag = 4, .srtcp_auth_tag = 10, .srtp_auth_key_len = 20, diff --git a/daemon/media_socket.c b/daemon/media_socket.c index afafd5210..62c06adf9 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -826,6 +826,8 @@ static int __k_srtp_crypt(struct rtpengine_srtp *s, struct crypto_context *c) { if (c->params.mki_len) memcpy(s->mki, c->params.mki, c->params.mki_len); memcpy(s->master_key, c->params.master_key, c->params.crypto_suite->master_key_len); + s->master_key_len = c->params.crypto_suite->master_key_len; + s->session_key_len = c->params.crypto_suite->session_key_len; memcpy(s->master_salt, c->params.master_salt, c->params.crypto_suite->master_salt_len); if (c->params.session_params.unencrypted_srtp) diff --git a/kernel-module/xt_RTPENGINE.c b/kernel-module/xt_RTPENGINE.c index 2108a1efa..a237ad234 100644 --- a/kernel-module/xt_RTPENGINE.c +++ b/kernel-module/xt_RTPENGINE.c @@ -231,7 +231,7 @@ static inline int bitfield_clear(unsigned long *bf, unsigned int i); struct re_crypto_context { spinlock_t lock; /* protects roc and last_index */ - unsigned char session_key[16]; + unsigned char session_key[32]; unsigned char session_salt[14]; unsigned char session_auth_key[20]; u_int32_t roc; @@ -501,9 +501,9 @@ static const struct re_cipher re_ciphers[] = { .id = REC_NULL, .name = "NULL", }, - [REC_AES_CM] = { - .id = REC_AES_CM, - .name = "AES-CM", + [REC_AES_CM_128] = { + .id = REC_AES_CM_128, + .name = "AES-CM-128", .tfm_name = "aes", .decrypt = srtp_encrypt_aes_cm, .encrypt = srtp_encrypt_aes_cm, @@ -516,6 +516,20 @@ static const struct re_cipher re_ciphers[] = { .encrypt = srtp_encrypt_aes_f8, .session_key_init = aes_f8_session_key_init, }, + [REC_AES_CM_192] = { + .id = REC_AES_CM_192, + .name = "AES-CM-192", + .tfm_name = "aes", + .decrypt = srtp_encrypt_aes_cm, + .encrypt = srtp_encrypt_aes_cm, + }, + [REC_AES_CM_256] = { + .id = REC_AES_CM_256, + .name = "AES-CM-256", + .tfm_name = "aes", + .decrypt = srtp_encrypt_aes_cm, + .encrypt = srtp_encrypt_aes_cm, + }, }; static const struct re_hmac re_hmacs[] = { @@ -1700,7 +1714,7 @@ static void aes_f8(unsigned char *in_out, int in_len, u_int32_t *xu; crypto_cipher_encrypt_one(iv_tfm, ivx, iv); - + pi = (void *) in_out; ki = (void *) key_block; lki = (void *) last_key_block; @@ -1747,7 +1761,7 @@ done: } static int aes_ctr_128_no_ctx(unsigned char *out, const char *in, int in_len, - const unsigned char *key, const unsigned char *iv) + const unsigned char *key, unsigned int key_len, const unsigned char *iv) { struct crypto_cipher *tfm; @@ -1755,14 +1769,14 @@ static int aes_ctr_128_no_ctx(unsigned char *out, const char *in, int in_len, if (IS_ERR(tfm)) return PTR_ERR(tfm); - crypto_cipher_setkey(tfm, key, 16); + crypto_cipher_setkey(tfm, key, key_len); aes_ctr_128(out, in, in_len, tfm, iv); crypto_free_cipher(tfm); return 0; } -static int prf_n(unsigned char *out, int len, const unsigned char *key, const unsigned char *x) { +static int prf_n(unsigned char *out, int len, const unsigned char *key, unsigned int key_len, const unsigned char *x) { unsigned char iv[16]; unsigned char o[32]; unsigned char in[32]; @@ -1773,7 +1787,7 @@ static int prf_n(unsigned char *out, int len, const unsigned char *key, const un in_len = len > 16 ? 32 : 16; memset(in, 0, in_len); - ret = aes_ctr_128_no_ctx(o, in, in_len, key, iv); + ret = aes_ctr_128_no_ctx(o, in, in_len, key, key_len, iv); if (ret) return ret; @@ -1795,7 +1809,7 @@ static int gen_session_key(unsigned char *out, int len, struct rtpengine_srtp *s for (i = 13 - 6; i < 14; i++) x[i] = key_id[i - (13 - 6)] ^ x[i]; - ret = prf_n(out, len, s->master_key, x); + ret = prf_n(out, len, s->master_key, s->master_key_len, x); if (ret) return ret; return 0; @@ -1836,7 +1850,7 @@ static int gen_session_keys(struct re_crypto_context *c, struct rtpengine_srtp * if (s->cipher == REC_NULL && s->hmac == REH_NULL) return 0; err = "failed to generate session key"; - ret = gen_session_key(c->session_key, 16, s, 0x00); + ret = gen_session_key(c->session_key, s->session_key_len, s, 0x00); if (ret) goto error; ret = gen_session_key(c->session_auth_key, 20, s, 0x01); @@ -1854,7 +1868,7 @@ static int gen_session_keys(struct re_crypto_context *c, struct rtpengine_srtp * c->tfm[0] = NULL; goto error; } - crypto_cipher_setkey(c->tfm[0], c->session_key, 16); + crypto_cipher_setkey(c->tfm[0], c->session_key, s->session_key_len); } if (c->cipher->session_key_init) { @@ -1874,21 +1888,69 @@ static int gen_session_keys(struct re_crypto_context *c, struct rtpengine_srtp * crypto_shash_setkey(c->shash, c->session_auth_key, 20); } - DBG("master key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + switch(s->master_key_len) { + case 16: + DBG("master key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", s->master_key[0], s->master_key[1], s->master_key[2], s->master_key[3], s->master_key[4], s->master_key[5], s->master_key[6], s->master_key[7], s->master_key[8], s->master_key[9], s->master_key[10], s->master_key[11], s->master_key[12], s->master_key[13], s->master_key[14], s->master_key[15]); + break; + case 24: + DBG("master key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + s->master_key[0], s->master_key[1], s->master_key[2], s->master_key[3], + s->master_key[4], s->master_key[5], s->master_key[6], s->master_key[7], + s->master_key[8], s->master_key[9], s->master_key[10], s->master_key[11], + s->master_key[12], s->master_key[13], s->master_key[14], s->master_key[15], + s->master_key[16], s->master_key[17], s->master_key[18], s->master_key[19], + s->master_key[20], s->master_key[21], s->master_key[22], s->master_key[23]); + break; + case 32: + DBG("master key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + s->master_key[0], s->master_key[1], s->master_key[2], s->master_key[3], + s->master_key[4], s->master_key[5], s->master_key[6], s->master_key[7], + s->master_key[8], s->master_key[9], s->master_key[10], s->master_key[11], + s->master_key[12], s->master_key[13], s->master_key[14], s->master_key[15], + s->master_key[16], s->master_key[17], s->master_key[18], s->master_key[19], + s->master_key[20], s->master_key[21], s->master_key[22], s->master_key[23], + s->master_key[24], s->master_key[25], s->master_key[26], s->master_key[27], + s->master_key[28], s->master_key[29], s->master_key[30], s->master_key[21]); + break; + } DBG("master salt %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", s->master_salt[0], s->master_salt[1], s->master_salt[2], s->master_salt[3], s->master_salt[4], s->master_salt[5], s->master_salt[6], s->master_salt[7], s->master_salt[8], s->master_salt[9], s->master_salt[10], s->master_salt[11], s->master_salt[12], s->master_salt[13]); - DBG("session key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + switch(s->session_key_len) { + case 16: + DBG("session key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", c->session_key[0], c->session_key[1], c->session_key[2], c->session_key[3], c->session_key[4], c->session_key[5], c->session_key[6], c->session_key[7], c->session_key[8], c->session_key[9], c->session_key[10], c->session_key[11], c->session_key[12], c->session_key[13], c->session_key[14], c->session_key[15]); + break; + case 24: + DBG("session key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + c->session_key[0], c->session_key[1], c->session_key[2], c->session_key[3], + c->session_key[4], c->session_key[5], c->session_key[6], c->session_key[7], + c->session_key[8], c->session_key[9], c->session_key[10], c->session_key[11], + c->session_key[12], c->session_key[13], c->session_key[14], c->session_key[15], + c->session_key[16], c->session_key[17], c->session_key[18], c->session_key[19], + c->session_key[20], c->session_key[21], c->session_key[22], c->session_key[23]); + break; + case 32: + DBG("session key %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + c->session_key[0], c->session_key[1], c->session_key[2], c->session_key[3], + c->session_key[4], c->session_key[5], c->session_key[6], c->session_key[7], + c->session_key[8], c->session_key[9], c->session_key[10], c->session_key[11], + c->session_key[12], c->session_key[13], c->session_key[14], c->session_key[15], + c->session_key[16], c->session_key[17], c->session_key[18], c->session_key[19], + c->session_key[20], c->session_key[21], c->session_key[22], c->session_key[23], + c->session_key[24], c->session_key[25], c->session_key[26], c->session_key[27], + c->session_key[28], c->session_key[29], c->session_key[30], c->session_key[21]); + break; + } DBG("session salt %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", c->session_salt[0], c->session_salt[1], c->session_salt[2], c->session_salt[3], c->session_salt[4], c->session_salt[5], c->session_salt[6], c->session_salt[7], @@ -2014,7 +2076,7 @@ retry: kfree(rda); goto retry; } - + t->dest_addr_hash.addrs[rh_it] = rda; re_bitfield_set(&t->dest_addr_hash.addrs_bf, rh_it); diff --git a/kernel-module/xt_RTPENGINE.h b/kernel-module/xt_RTPENGINE.h index 08d6964ac..812432b03 100644 --- a/kernel-module/xt_RTPENGINE.h +++ b/kernel-module/xt_RTPENGINE.h @@ -41,8 +41,10 @@ struct re_address { enum rtpengine_cipher { REC_INVALID = 0, REC_NULL, - REC_AES_CM, + REC_AES_CM_128, REC_AES_F8, + REC_AES_CM_192, + REC_AES_CM_256, __REC_LAST }; @@ -59,8 +61,10 @@ enum rtpengine_hmac { struct rtpengine_srtp { enum rtpengine_cipher cipher; enum rtpengine_hmac hmac; - unsigned char master_key[16]; + unsigned char master_key[32]; + unsigned int master_key_len; unsigned char master_salt[14]; + unsigned int session_key_len; unsigned char mki[256]; /* XXX uses too much memory? */ u_int64_t last_index; unsigned int auth_tag_len; /* in bytes */