Adding more tls configuration details to sip.conf sample, with a list of valid cipher...

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

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 1085be9..df7f1a2 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -84,6 +84,27 @@ tcpbindaddr=0.0.0.0          ; IP address for TCP server to bind to (0.0.0.0 bind
 ;tlscertfile=asterisk.pem      ; Certificate file (*.pem only) to use for TLS connections 
                                ; default is to look for "asterisk.pem" in current directory
 
+;tlscafile=</path/to/certificate>
+;      If the server your connecting to uses a self signed certificate
+;      you should have their certificate installed here so the code can 
+;      verify the authenticity of their certificate.
+
+;tlscadir=</path/to/ca/dir>
+;      A directory full of CA certificates.  The files must be named with 
+;      the CA subject name hash value. 
+;      (see man SSL_CTX_load_verify_locations for more info) 
+
+;tlsdontverifyserver=[yes|no]
+;      If set to yes, don't verify the servers certificate when acting as 
+;      a client.  If you don't have the server's CA certificate you can
+;      set this and it will connect without requiring tlscafile to be set.
+;      Default is no.
+
+;tlscipher=<SSL cipher string>
+;      A string specifying which SSL ciphers to use or not use
+;      A list of valid SSL cipher strings can be found at: 
+;              http://www.openssl.org/docs/apps/ciphers.html#CIPHER_STRINGS
+
 srvlookup=yes                  ; Enable DNS SRV lookups on outbound calls
                                ; Note: Asterisk only uses the first host 
                                ; in SRV records

diff --git a/doc/siptls.txt b/doc/siptls.txt
index 482939a..1783806 100644 (file)
--- a/doc/siptls.txt
+++ b/doc/siptls.txt
@@ -47,6 +47,8 @@ tlsdontverifyserver=[yes|no]
 
 tlscipher=<SSL cipher string>
        A string specifying which SSL ciphers to use or not use
+       A list of valid SSL cipher strings can be found at: 
+               http://www.openssl.org/docs/apps/ciphers.html#CIPHER_STRINGS
 
 
 Sample config