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

Timestamp:

Jul 15, 2018 2:09:23 PM (6 years ago)

Author:

riza

Message:

Close #484: Allow to use binary certificate in TLS transport.

File:

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

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

@@ -587 +587 @@
     if (listener->tls_setting.cert_file.slen ||
         listener->tls_setting.ca_list_file.slen ||
-        listener->tls_setting.ca_list_path.slen) 
+        listener->tls_setting.ca_list_path.slen || 
+        listener->tls_setting.privkey_file.slen) 
     {
         status = pj_ssl_cert_load_from_files2(pool,
@@ -598 +599 @@
         if (status != PJ_SUCCESS)
             goto on_error;
+    } else if (listener->tls_setting.ca_buf.slen ||
+               listener->tls_setting.cert_buf.slen||
+               listener->tls_setting.privkey_buf.slen)
+    {
+        status = pj_ssl_cert_load_from_buffer(pool,
+                        &listener->tls_setting.ca_buf,
+                        &listener->tls_setting.cert_buf,
+                        &listener->tls_setting.privkey_buf,
+                        &listener->tls_setting.password,
+                        &listener->cert);
+        if (status != PJ_SUCCESS)
+            goto on_error;    
     }