Changeset 5850

Timestamp:

Aug 1, 2018 8:34:19 AM (6 years ago)

Author:

ming

Message:

Fixed #2136: Increase default ICE password length as mandated by the RFC

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)
• pjnath/include/pjnath/config.h (modified) (2 diffs)
• pjnath/src/pjnath/ice_session.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -701 +701 @@
             pjmedia_sdp_attr_add(&m->attr_count, m->attr, attr);
 
+            str.slen = PJ_ICE_PWD_LEN;
             str.ptr = (char*) pj_pool_alloc(sdp_pool, str.slen);
             pj_create_random_string(str.ptr, str.slen);

pjproject/trunk/pjnath/include/pjnath/config.h

@@ -431 +431 @@
 /**
  * This constant specifies the length of random string generated for ICE
- * ufrag and password.
+ * ufrag.
  *
  * Default: 8 (characters)
@@ -437 +437 @@
 #ifndef PJ_ICE_UFRAG_LEN
 #   define PJ_ICE_UFRAG_LEN                         8
+#endif
+
+
+/**
+ * This constant specifies the length of random string generated for ICE
+ * password.
+ *
+ * Default: 24 (characters)
+ */
+#ifndef PJ_ICE_PWD_LEN
+#   define PJ_ICE_PWD_LEN                           24
 #endif
 

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -410 +410 @@
 
     if (local_passwd == NULL) {
-        ice->rx_pass.ptr = (char*) pj_pool_alloc(ice->pool, PJ_ICE_UFRAG_LEN);
-        pj_create_random_string(ice->rx_pass.ptr, PJ_ICE_UFRAG_LEN);
-        ice->rx_pass.slen = PJ_ICE_UFRAG_LEN;
+        ice->rx_pass.ptr = (char*) pj_pool_alloc(ice->pool, PJ_ICE_PWD_LEN);
+        pj_create_random_string(ice->rx_pass.ptr, PJ_ICE_PWD_LEN);
+        ice->rx_pass.slen = PJ_ICE_PWD_LEN;
     } else {
         pj_strdup(ice->pool, &ice->rx_pass, local_passwd);