Corrected crypto tag in SDP ANSWER for SRTP. (again)

The original fix (r380043) for getting Asterisk to respond with the correct
tag overlooked some corner cases, and the fact that the same code is in 1.8.

This patch moves the building of the crypto line out of
sdp_crypto_process(). Instead, it merely copies the accepted tag. The call to
sdp_crypto_offer() will build the crypto line in all cases now, using a tag of
"1" in the case of sending offers.

(closes issue ASTERISK-20849)
Reported by: José Luis Millán
Review: https://reviewboard.asterisk.org/r/2295/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@380347 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/sip/sdp_crypto.c b/channels/sip/sdp_crypto.c
index ea8ea64162ddd58329ef4a8ffd0a08f714038430..3f541fa578fb0175f3f8fca823e61d2b4eadc02e 100644 (file)
--- a/channels/sip/sdp_crypto.c
+++ b/channels/sip/sdp_crypto.c
@@ -48,6 +48,7 @@ extern struct ast_srtp_policy_res *res_srtp_policy;
 struct sdp_crypto {
        char *a_crypto;
        unsigned char local_key[SRTP_MASTER_LEN];
+       char *tag;
        char local_key64[SRTP_MASTER_LEN64];
        unsigned char remote_key[SRTP_MASTER_LEN];
        char suite[64];
@@ -64,6 +65,8 @@ void sdp_crypto_destroy(struct sdp_crypto *crypto)
 {
        ast_free(crypto->a_crypto);
        crypto->a_crypto = NULL;
+       ast_free(crypto->tag);
+       crypto->tag = NULL;
        ast_free(crypto);
 }
 
@@ -197,7 +200,6 @@ int sdp_crypto_process(struct sdp_crypto *p, const char *attr, struct ast_rtp_in
        char *key_salt = NULL;
        char *lifetime = NULL;
        int found = 0;
-       int attr_len = strlen(attr);
        int key_len = 0;
        int suite_val = 0;
        unsigned char remote_key[SRTP_MASTER_LEN];
@@ -277,36 +279,38 @@ int sdp_crypto_process(struct sdp_crypto *p, const char *attr, struct ast_rtp_in
                return -1;
        }
 
-       if (!p->a_crypto) {
-               if (!(p->a_crypto = ast_calloc(1, attr_len + 11))) {
-                       ast_log(LOG_ERROR, "Could not allocate memory for a_crypto\n");
+       if (!p->tag) {
+               ast_log(LOG_DEBUG, "Accepting crypto tag %s\n", tag);
+               p->tag = ast_strdup(tag);
+               if (!p->tag) {
+                       ast_log(LOG_ERROR, "Could not allocate memory for tag\n");
                        return -1;
                }
-               snprintf(p->a_crypto, attr_len + 10, "a=crypto:%s %s inline:%s\r\n", tag, suite, p->local_key64);
        }
-       return 0;
+
+       /* Finally, rebuild the crypto line */
+       return sdp_crypto_offer(p);
 }
 
 int sdp_crypto_offer(struct sdp_crypto *p)
 {
-       char crypto_buf[128];
-
        if (ast_strlen_zero(p->suite)) {
                /* Default crypto offer */
                strcpy(p->suite, "AES_CM_128_HMAC_SHA1_80");
        }
 
+       /* Rebuild the crypto line */
        if (p->a_crypto) {
                ast_free(p->a_crypto);
        }
 
-       if (snprintf(crypto_buf, sizeof(crypto_buf), "a=crypto:1 %s inline:%s\r\n",  p->suite, p->local_key64) < 1) {
+       if (ast_asprintf(&p->a_crypto, "a=crypto:%s %s inline:%s\r\n",
+                        p->tag ? p->tag : "1", p->suite, p->local_key64) == -1) {
+                       ast_log(LOG_ERROR, "Could not allocate memory for crypto line\n");
                return -1;
        }
 
-       if (!(p->a_crypto = ast_strdup(crypto_buf))) {
-               return -1;
-       }
+       ast_log(LOG_DEBUG, "Crypto line: %s", p->a_crypto);
 
        return 0;
 }