From: Scott Griepentrog Date: Fri, 31 Oct 2014 16:41:06 +0000 (+0000) Subject: pjsip: clarify tls cert and key file usage X-Git-Tag: 14.0.0-beta1~1505 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28173ddf05a72a573524e3ce16fea85305aad20d;p=thirdparty%2Fasterisk.git pjsip: clarify tls cert and key file usage A question arose as to whether a .pem file could be provided in place of the .crt and .key files in a PJSIP TLS configuration. I tested this and discovered that although a cert will be read from the pem file, a key will not, and thus the priv_key_file entry is still required. This update to the fine documentation clarifies the option usage. AST-1448 #close Review: https://reviewboard.asterisk.org/r/4129/ Reported by: John Bigelow ........ Merged revisions 426928 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 426930 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@426932 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index 8305616715..d6932e38c6 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -747,7 +747,10 @@ ; "") ;ca_list_file= ; File containing a list of certificates to read TLS ONLY ; (default: "") -;cert_file= ; Certificate file for endpoint TLS ONLY (default: "") +;cert_file= ; Certificate file for endpoint TLS ONLY + ; Will read .crt or .pem file but only uses cert, + ; a .key file must be specified via priv_key_file + ; (default: "") ;cipher= ; Preferred cryptography cipher names TLS ONLY (default: "") ;domain= ; Domain the transport comes from (default: "") ;external_media_address= ; External IP address to use in RTP handling diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 7be8ff81e4..b350b7b775 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -821,6 +821,12 @@ Certificate file for endpoint (TLS ONLY) + + A path to a .crt or .pem file can be provided. However, only + the certificate is read from the file, not the private key. + The priv_key_file option must supply a + matching key file. + Preferred cryptography cipher names (TLS ONLY)