From 14c158564586f99daf27cbb734af167d1fba6eff Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 31 Jan 2011 22:26:06 +0000
Subject: [PATCH] Merged revisions 305247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r305247 | qwell | 2011-01-31 16:25:23 -0600 (Mon, 31 Jan 2011) | 7 lines
Add alternative name for config option.
The SIP sample configuration had "tlscadir" as the option name, but chan_sip
used the more correct "tlscapath". Now both are accepted.
Discovered (sort of) by a user on IRC in #asterisk
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
configs/sip.conf.sample | 2 +-
main/tcptls.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index c416bd2394..3282afda44 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -447,7 +447,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; you should have their certificate installed here so the code can
; verify the authenticity of their certificate.
-;tlscadir=</path/to/ca/dir>
+;tlscapath=</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)
diff --git a/main/tcptls.c b/main/tcptls.c
index b505f2a019..d0ee3b2aa7 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -550,7 +550,7 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
} else if (!strcasecmp(varname, "tlscafile")) {
ast_free(tls_cfg->cafile);
tls_cfg->cafile = ast_strdup(value);
- } else if (!strcasecmp(varname, "tlscapath")) {
+ } else if (!strcasecmp(varname, "tlscapath") || !strcasecmp(varname, "tlscadir")) {
ast_free(tls_cfg->capath);
tls_cfg->capath = ast_strdup(value);
} else if (!strcasecmp(varname, "tlsverifyclient")) {
--
GitLab