diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-01-15 06:55:02 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-01-15 06:55:02 +0000 |
| commit | 8a7f21ccfdb0e0883c6ba951de5c7065a8e263a0 (patch) | |
| tree | ae65ffab1c0659d3932054e2db33d3eb33195fed /pjsip | |
| parent | 61c0fc6417c175c88155f44183e66c8fbb7652e4 (diff) | |
Close #1810: Adding CA path support into SSL socket.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4973 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/include/pjsip/sip_transport_tls.h | 5 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_tls.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pjsip/include/pjsip/sip_transport_tls.h b/pjsip/include/pjsip/sip_transport_tls.h index 5a36384d..f9ebd4df 100644 --- a/pjsip/include/pjsip/sip_transport_tls.h +++ b/pjsip/include/pjsip/sip_transport_tls.h @@ -85,6 +85,11 @@ typedef struct pjsip_tls_setting pj_str_t ca_list_file; /** + * Certificate of Authority (CA) list directory path. + */ + pj_str_t ca_list_path; + + /** * Public endpoint certificate file, which will be used as client- * side certificate for outgoing TLS connection, and server-side * certificate for incoming TLS connection. diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c index 10c4f574..9230df79 100644 --- a/pjsip/src/pjsip/sip_transport_tls.c +++ b/pjsip/src/pjsip/sip_transport_tls.c @@ -441,10 +441,12 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, /* Check if certificate/CA list for SSL socket is set */ if (listener->tls_setting.cert_file.slen || - listener->tls_setting.ca_list_file.slen) + listener->tls_setting.ca_list_file.slen || + listener->tls_setting.ca_list_path.slen) { - status = pj_ssl_cert_load_from_files(pool, + status = pj_ssl_cert_load_from_files2(pool, &listener->tls_setting.ca_list_file, + &listener->tls_setting.ca_list_path, &listener->tls_setting.cert_file, &listener->tls_setting.privkey_file, &listener->tls_setting.password, |