Changeset 5781 for pjproject

Timestamp:

Apr 17, 2018 10:52:33 AM (6 years ago)

Author:

nanang

Message:

Re #2096:

• Fixed DTLS-SRTP issues with AEAD_AES_256_GCM crypto, e.g: material buffer length too short, silly mistake of missing comma in PJSIP-OpenSSL crypto map.
• Fixed SRTP error PJMEDIA_SRTP_ESDPREQCRYPTO when crypto count is set to zero and SRTP is in mandatory mode.
• Fixed SRTP transport attach where stream RTP/RTCP reception callbacks may be overriden by DTLS-SRTP.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• transport_srtp.c (modified) (3 diffs)
• transport_srtp_dtls.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -682 +682 @@
     PJ_ASSERT_RETURN(endpt && tp && p_tp, PJ_EINVAL);
 
-    /* Check crypto availability */
-    if (opt && opt->crypto_count == 0 &&
-        opt->use == PJMEDIA_SRTP_MANDATORY)
-        return PJMEDIA_SRTP_ESDPREQCRYPTO;
-
     /* Check crypto */
     if (opt && opt->use != PJMEDIA_SRTP_DISABLED) {
@@ -740 +735 @@
      * i.e: all available crypto but 'NULL'.
      */
-    if (srtp->setting.crypto_count == 0) {
+    if (srtp->setting.crypto_count == 0 && opt->use != PJMEDIA_SRTP_DISABLED)
+    {
         srtp->setting.crypto_count = PJMEDIA_SRTP_MAX_CRYPTOS;
         pjmedia_srtp_enum_crypto(&srtp->setting.crypto_count,
@@ -1115 +1111 @@
     /* Save the callbacks */
     pj_lock_acquire(srtp->mutex);
-    srtp->rtp_cb = param->rtp_cb;
-    srtp->rtp_cb2 = param->rtp_cb2;
-    srtp->rtcp_cb = param->rtcp_cb;
-    srtp->user_data = param->user_data;
+    if (param->rtp_cb || param->rtp_cb2) {
+        /* Do not update rtp_cb if not set, as attach() is called by
+         * keying method.
+         */
+        srtp->rtp_cb = param->rtp_cb;
+        srtp->rtp_cb2 = param->rtp_cb2;
+        srtp->rtcp_cb = param->rtcp_cb;
+        srtp->user_data = param->user_data;
+    }
     pj_lock_release(srtp->mutex);
 

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -357 +357 @@
      "SRTP_AES128_CM_SHA1_80",
      "SRTP_AES128_CM_SHA1_32",
-     "SRTP_AEAD_AES_256_GCM"
-     "SRTP_AEAD_AES_128_GCM",
+     "SRTP_AEAD_AES_256_GCM",
+     "SRTP_AEAD_AES_128_GCM"
 };
 static char* pj_profiles[] =
@@ -364 +364 @@
     "AES_CM_128_HMAC_SHA1_80",
     "AES_CM_128_HMAC_SHA1_32",
-    "AEAD_AES_256_GCM"
-    "AEAD_AES_128_GCM",
+    "AEAD_AES_256_GCM",
+    "AEAD_AES_128_GCM"
 };
 
@@ -473 +473 @@
 static pj_status_t ssl_get_srtp_material(dtls_srtp *ds)
 {
-    unsigned char material[SRTP_MAX_KEY_LEN];
+    unsigned char material[SRTP_MAX_KEY_LEN * 2];
     SRTP_PROTECTION_PROFILE *profile;
     int rc, i, crypto_idx = -1;