From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Aug 2016 16:48:43 +0000 (-0500)
Subject: Merge "sip_to_pjsip: Add cert_file and ca_list_path." into 13
X-Git-Tag: 13.12.0-rc1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5165fd0aa637b1b01dcf4556d59b57b4b9b8591;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip: Add cert_file and ca_list_path." into 13
---

f5165fd0aa637b1b01dcf4556d59b57b4b9b8591
diff --cc contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
index d3218dc1e9,ecbac1340e..8dfbd9bd9f
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
@@@ -756,8 -772,10 +770,9 @@@ def create_tls(sip, pjsip, nmapped)
          (['tlsprivatekey', 'sslprivatekey'], set_tls_private_key),
          (['tlscipher', 'sslcipher'], set_tls_cipher),
          (['tlscafile'], set_tls_cafile),
+         (['tlscapath', 'tlscadir'], set_tls_capath),
          (['tlsverifyclient'], set_tls_verifyclient),
 -        (['tlsdontverifyserver'], set_tls_verifyserver),
 -        (['tlsclientmethod', 'sslclientmethod'], set_tls_method)
 +        (['tlsdontverifyserver'], set_tls_verifyserver)
      ]
  
      try: