]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "sip_to_pjsip: Add cert_file and ca_list_path." into 13
authorJoshua Colp <jcolp@digium.com>
Thu, 18 Aug 2016 16:48:43 +0000 (11:48 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 18 Aug 2016 16:48:43 +0000 (11:48 -0500)
1  2 
contrib/scripts/sip_to_pjsip/sip_to_pjsip.py

index d3218dc1e9f640a54535b4ed9411e5ea36e0d986,ecbac1340e274da01967776d0b0f3b3037b225c2..8dfbd9bd9f67664fed5232d85279eb015cc2b6e4
@@@ -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: