Changeset 5781 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

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.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (3 diffs)

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;