summaryrefslogtreecommitdiff
path: root/pjlib/include
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2015-05-07 04:48:19 +0000
committerNanang Izzuddin <nanang@teluu.com>2015-05-07 04:48:19 +0000
commit3866e1c3e2173b477cfaceb1f13f8a9458dcfaa3 (patch)
treee403650ce7bf204d347826be7a3951228fed0162 /pjlib/include
parentd2e299bfe6ca3dd77727c3928b6898767d8e51d2 (diff)
Close #1849: Enabled multiple TLS certificate chains (RSA+ECC+DSA) for server socket.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5087 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include')
-rw-r--r--pjlib/include/pj/ssl_sock.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/pjlib/include/pj/ssl_sock.h b/pjlib/include/pj/ssl_sock.h
index 172943da..c24e7bd9 100644
--- a/pjlib/include/pj/ssl_sock.h
+++ b/pjlib/include/pj/ssl_sock.h
@@ -185,7 +185,10 @@ typedef struct pj_ssl_cert_info {
/**
- * Create credential from files.
+ * Create credential from files. TLS server application can provide multiple
+ * certificates (RSA, ECC, and DSA) by supplying certificate name with "_rsa"
+ * suffix, e.g: "pjsip_rsa.pem", the library will automatically check for
+ * other certificates with "_ecc" and "_dsa" suffix.
*
* @param CA_file The file of trusted CA list.
* @param cert_file The file of certificate.
@@ -203,7 +206,10 @@ PJ_DECL(pj_status_t) pj_ssl_cert_load_from_files(pj_pool_t *pool,
pj_ssl_cert_t **p_cert);
/**
- * Create credential from files.
+ * Create credential from files. TLS server application can provide multiple
+ * certificates (RSA, ECC, and DSA) by supplying certificate name with "_rsa"
+ * suffix, e.g: "pjsip_rsa.pem", the library will automatically check for
+ * other certificates with "_ecc" and "_dsa" suffix.
*
* This is the same as pj_ssl_cert_load_from_files() but also
* accepts an additional param CA_path to load CA certificates from