Changeset 3999 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -294 +294 @@
     if (ssock_param.read_buffer_size < PJSIP_MAX_PKT_LEN)
         ssock_param.read_buffer_size = PJSIP_MAX_PKT_LEN;
+    ssock_param.ciphers_num = listener->tls_setting.ciphers_num;
+    ssock_param.ciphers = listener->tls_setting.ciphers;
     ssock_param.qos_type = listener->tls_setting.qos_type;
     ssock_param.qos_ignore_error = listener->tls_setting.qos_ignore_error;
@@ -863 +865 @@
     ssock_param.async_cnt = 1;
     ssock_param.ioqueue = pjsip_endpt_get_ioqueue(listener->endpt);
-    PJ_TODO(synchronize_tls_cipher_type_with_ssl_sock_cipher_type);
     ssock_param.server_name = remote_name;
     ssock_param.timeout = listener->tls_setting.timeout;
@@ -873 +874 @@
     if (ssock_param.read_buffer_size < PJSIP_MAX_PKT_LEN)
         ssock_param.read_buffer_size = PJSIP_MAX_PKT_LEN;
+    ssock_param.ciphers_num = listener->tls_setting.ciphers_num;
+    ssock_param.ciphers = listener->tls_setting.ciphers;
     ssock_param.qos_type = listener->tls_setting.qos_type;
     ssock_param.qos_ignore_error = listener->tls_setting.qos_ignore_error;