From: Rusty Newton <rnewton@digium.com>
Date: Wed, 28 May 2014 20:52:13 +0000 (+0000)
Subject: pjsip.conf: privkey_file should be priv_key_file, mediaencryption=yes should be media... 
X-Git-Tag: 12.4.0-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24def593a579bf570762b47757ca5f2951c69579;p=thirdparty%2Fasterisk.git

pjsip.conf: privkey_file should be priv_key_file, mediaencryption=yes should be mediaencryption=sdes

privkey_file was missed in the snake case update. An example included an invalid value for the mediaencryption option.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@414780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configs/pjsip.conf.sample b/configs/pjsip.conf.sample
index 704c978260..1bcfcb96b1 100644
--- a/configs/pjsip.conf.sample
+++ b/configs/pjsip.conf.sample
@@ -147,7 +147,7 @@
 ;protocol=tls
 ;bind=0.0.0.0
 ;cert_file=/path/mycert.crt
-;privkey_file=/path/mykey.key
+;priv_key_file=/path/mykey.key
 ;cipher=ALL
 ;method=tlsv1
 
@@ -282,7 +282,7 @@
 ; Use the "contact=" line instead of max_contacts= if you want to statically
 ; define the location of the device.
 ;
-; If using the TLS enabled transport, you may want the "media_encryption=yes"
+; If using the TLS enabled transport, you may want the "media_encryption=sdes"
 ; option to additionally enable SRTP, though they are not mutually inclusive.
 ;
 ; Use the "rtp_ipv6=yes" option if you want to utilize RTP over an ipv6 transport.
@@ -304,7 +304,7 @@
 ; A few more transports to pick from, and some related options below them.
 ;
 ;transport=transport-tls
-;media_encryption=yes
+;media_encryption=sdes
 ;transport=transport-udp-ipv6
 ;rtp_ipv6=yes
 ;transport=transport-udp-nat