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

Timestamp:

Dec 30, 2009 6:35:20 AM (15 years ago)

Author:

nanang

Message:

Ticket #1005:

• Fixed bug in pjsip_tls_transport_start(): specified ca_list_file must be applied even when cert_file is not set.
• Fixed bug in lis_create_transport(): new transport should inherit cert settings (from listener).
• Fixed pjsua app, missing TLS transport setting 'require_client_cert' for '--tls-verify-client' option.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c (modified) (4 diffs)

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

@@ -55 +55 @@
     pjsip_tpmgr             *tpmgr;
     pj_ssl_sock_t           *ssock;
+    pj_ssl_cert_t           *cert;
     pjsip_tls_setting        tls_setting;
 };
@@ -289 +290 @@
     }
 
-    /* Check if certificate for SSL socket is set */
-    if (listener->tls_setting.cert_file.slen) 
+    /* Check if certificate/CA list for SSL socket is set */
+    if (listener->tls_setting.cert_file.slen ||
+        listener->tls_setting.ca_list_file.slen) 
     {
-        pj_ssl_cert_t *cert;
-
         status = pj_ssl_cert_load_from_files(pool,
                         &listener->tls_setting.ca_list_file,
@@ -299 +299 @@
                         &listener->tls_setting.privkey_file,
                         &listener->tls_setting.password,
-                        &cert);
+                        &listener->cert);
         if (status != PJ_SUCCESS)
             goto on_error;
 
-        status = pj_ssl_sock_set_certificate(listener->ssock, pool, cert);
+        status = pj_ssl_sock_set_certificate(listener->ssock, pool, 
+                                             listener->cert);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -838 +839 @@
         return status;
 
+    /* Apply SSL certificate */
+    if (listener->cert) {
+        status = pj_ssl_sock_set_certificate(ssock, pool, listener->cert);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
+
     /* Initially set bind address to PJ_INADDR_ANY port 0 */
     pj_sockaddr_in_init(&local_addr, NULL, 0);