[svn-commits] mjordan: branch 13 r432258 - in /branches/13: ./ main/sdp_srtp.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Feb 25 15:42:07 CST 2015
Author: mjordan
Date: Wed Feb 25 15:42:04 2015
New Revision: 432258
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=432258
Log:
channels/sip/sdp_crypto: Handle SRTP keys negotiated with key lifetime/MKI
Prior to this patch, SDP offers negotiating SDES-SRTP crypto attributes would
be rejected if those crypto attributes contained either a key lifetime or a
MKI parameter. While from a theoretical point of view this was defensible -
Asterisk does not support key lifetimes or multiple crypto keys - from a
practical point of view, this is quite a problem. A large number of endpoints
offer lifetimes/MKI, which Asterisk can tolerate so long as it doesn't actually
have to support anything more than a single key or refresh the key.
In reality, this is (so far as we've seen) always the case.
This patch is a forward port of Olle's work in the lingon-srtp-key-lifetime-1.8
branch. To quote Olle from ASTERISK-17721, it handles lifetime/MKI parameters
in the following fashion:
> The Lingon branch now handle lifetime and MKI parameters.
>
> We only accept lifetimes up to max for the crypto and higher than 10 hours
> for packetization of 20 ms (50 pps).
>
> We only handle MKI with index 1.
>
> We do not really bother with counting packets and reinviting at end of
> lifetime, so the min of 10 hours kind of takes care of most calls. If there
> are longer ones, we rely on the other side for re-invites.
>
> It's still not perfect, but I personally think this is an improvement. A
> configuration option for minimum lifetime accepted could be added.
When the patch was ported forward, I decided against adding a configuration
option as Olle's handling was more than sufficient for every case I've seen
come through the issue tracker or through interoperability testing. We can
revisit that decision if it proves to be false.
A few small other tweaks were made to the surrounding code to reduce
indentation and provide better type safety for the 'tag' parameter.
Review: https://reviewboard.asterisk.org/r/4419/
Review: https://reviewboard.asterisk.org/r/4418/
ASTERISK-17721 #close
Reported by: Terry Wilson
ASTERISK-17899 #close
Reported by: Dwayne Hubbard
patches:
lingon-srtp-key-lifetime-1.8.diff uploaded by oej (License 5267)
ASTERISK-20233
Reported by: tootai
ASTERISK-22748
Reported by: Alejandro Mejia
........
Merged revisions 432239 from http://svn.asterisk.org/svn/asterisk/branches/11
Modified:
branches/13/ (props changed)
branches/13/main/sdp_srtp.c
Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Modified: branches/13/main/sdp_srtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/sdp_srtp.c?view=diff&rev=432258&r1=432257&r2=432258
==============================================================================
--- branches/13/main/sdp_srtp.c (original)
+++ branches/13/main/sdp_srtp.c Wed Feb 25 15:42:04 2015
@@ -34,6 +34,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include <math.h>
#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/sdp_srtp.h"
@@ -68,7 +69,7 @@
struct ast_sdp_crypto {
char *a_crypto;
unsigned char local_key[SRTP_MASTER_LEN];
- char *tag;
+ int tag;
char local_key64[SRTP_MASTER_LEN64];
unsigned char remote_key[SRTP_MASTER_LEN];
};
@@ -79,8 +80,6 @@
{
ast_free(crypto->a_crypto);
crypto->a_crypto = NULL;
- ast_free(crypto->tag);
- crypto->tag = NULL;
ast_free(crypto);
}
@@ -97,6 +96,7 @@
if (!(p = ast_calloc(1, sizeof(*p)))) {
return NULL;
}
+ p->tag = 1;
if (res_srtp->get_random(p->local_key, sizeof(p->local_key)) < 0) {
ast_sdp_crypto_destroy(p);
@@ -109,13 +109,13 @@
if (key_len != SRTP_MASTER_LEN) {
ast_log(LOG_ERROR, "base64 encode/decode bad len %d != %d\n", key_len, SRTP_MASTER_LEN);
- ast_free(p);
+ ast_sdp_crypto_destroy(p);
return NULL;
}
if (memcmp(remote_key, p->local_key, SRTP_MASTER_LEN)) {
ast_log(LOG_ERROR, "base64 encode/decode bad key\n");
- ast_free(p);
+ ast_sdp_crypto_destroy(p);
return NULL;
}
@@ -211,13 +211,15 @@
char *key_params = NULL;
char *key_param = NULL;
char *session_params = NULL;
- char *key_salt = NULL;
- char *lifetime = NULL;
+ char *key_salt = NULL; /* The actual master key and key salt */
+ char *lifetime = NULL; /* Key lifetime (# of RTP packets) */
+ char *mki = NULL; /* Master Key Index */
int found = 0;
int key_len = 0;
int suite_val = 0;
unsigned char remote_key[SRTP_MASTER_LEN];
int taglen = 0;
+ double sdes_lifetime;
struct ast_sdp_crypto *crypto = srtp->crypto;
if (!ast_rtp_engine_srtp_is_registered()) {
@@ -233,6 +235,11 @@
if (!tag || !suite) {
ast_log(LOG_WARNING, "Unrecognized crypto attribute a=%s\n", attr);
+ return -1;
+ }
+
+ if (sscanf(tag, "%30d", &crypto->tag) != 1 || crypto->tag <= 0 || crypto->tag > 9) {
+ ast_log(LOG_WARNING, "Unacceptable a=crypto tag: %s\n", tag);
return -1;
}
@@ -255,33 +262,88 @@
}
while ((key_param = strsep(&key_params, ";"))) {
+ unsigned int n_lifetime;
char *method = NULL;
char *info = NULL;
method = strsep(&key_param, ":");
info = strsep(&key_param, ";");
-
- if (!strcmp(method, "inline")) {
- key_salt = strsep(&info, "|");
- lifetime = strsep(&info, "|");
-
- if (lifetime) {
- ast_log(LOG_NOTICE, "Crypto life time unsupported: %s\n", attr);
+ sdes_lifetime = 0;
+
+ if (strcmp(method, "inline")) {
+ continue;
+ }
+
+ key_salt = strsep(&info, "|");
+
+ /* The next parameter can be either lifetime or MKI */
+ lifetime = strsep(&info, "|");
+ if (!lifetime) {
+ found = 1;
+ break;
+ }
+
+ mki = strchr(lifetime, ':');
+ if (mki) {
+ mki = lifetime;
+ lifetime = NULL;
+ } else {
+ mki = strsep(&info, "|");
+ }
+
+ if (mki && *mki != '1') {
+ ast_log(LOG_NOTICE, "Crypto MKI handling is not supported: ignoring attribute %s\n", attr);
+ continue;
+ }
+
+ if (lifetime) {
+ if (!strncmp(lifetime, "2^", 2)) {
+ char *lifetime_val = lifetime + 2;
+
+ /* Exponential lifetime */
+ if (sscanf(lifetime_val, "%30u", &n_lifetime) != 1) {
+ ast_log(LOG_NOTICE, "Failed to parse lifetime value in crypto attribute: %s\n", attr);
+ continue;
+ }
+
+ if (n_lifetime > 48) {
+ /* Yeah... that's a bit big. */
+ ast_log(LOG_NOTICE, "Crypto lifetime exponent of '%u' is a bit large; using 48\n", n_lifetime);
+ n_lifetime = 48;
+ }
+ sdes_lifetime = pow(2, n_lifetime);
+ } else {
+ /* Decimal lifetime */
+ if (sscanf(lifetime, "%30u", &n_lifetime) != 1) {
+ ast_log(LOG_NOTICE, "Failed to parse lifetime value in crypto attribute: %s\n", attr);
+ continue;
+ }
+ sdes_lifetime = n_lifetime;
+ }
+
+ /* Accept anything above 10 hours. Less than 10; reject. */
+ if (sdes_lifetime < 1800000) {
+ ast_log(LOG_NOTICE, "Rejecting crypto attribute '%s': lifetime '%f' too short\n", attr, sdes_lifetime);
continue;
}
-
- found = 1;
- break;
- }
+ }
+
+ ast_debug(2, "Crypto attribute '%s' accepted with lifetime '%f', MKI '%s'\n",
+ attr, sdes_lifetime, mki ? mki : "-");
+
+ found = 1;
+ break;
}
if (!found) {
- ast_log(LOG_NOTICE, "SRTP crypto offer not acceptable\n");
- return -1;
- }
-
- if ((key_len = ast_base64decode(remote_key, key_salt, sizeof(remote_key))) != SRTP_MASTER_LEN) {
- ast_log(LOG_WARNING, "SRTP descriptions key %d != %d\n", key_len, SRTP_MASTER_LEN);
+ ast_log(LOG_NOTICE, "SRTP crypto offer not acceptable: '%s'\n", attr);
+ return -1;
+ }
+
+ key_len = ast_base64decode(remote_key, key_salt, sizeof(remote_key));
+ if (key_len != SRTP_MASTER_LEN) {
+ ast_log(LOG_WARNING, "SRTP descriptions key length '%d' != master length '%d'\n",
+ key_len, SRTP_MASTER_LEN);
return -1;
}
@@ -296,15 +358,6 @@
return -1;
}
- if (!crypto->tag) {
- ast_debug(1, "Accepting crypto tag %s\n", tag);
- crypto->tag = ast_strdup(tag);
- if (!crypto->tag) {
- ast_log(LOG_ERROR, "Could not allocate memory for tag\n");
- return -1;
- }
- }
-
/* Finally, rebuild the crypto line */
if (ast_sdp_crypto_build_offer(crypto, taglen)) {
return -1;
@@ -321,8 +374,8 @@
ast_free(p->a_crypto);
}
- if (ast_asprintf(&p->a_crypto, "%s AES_CM_128_HMAC_SHA1_%i inline:%s",
- p->tag ? p->tag : "1", taglen, p->local_key64) == -1) {
+ if (ast_asprintf(&p->a_crypto, "%d AES_CM_128_HMAC_SHA1_%i inline:%s",
+ p->tag, taglen, p->local_key64) == -1) {
ast_log(LOG_ERROR, "Could not allocate memory for crypto line\n");
return -1;
}
More information about the svn-commits
mailing list