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: http://svn.digium.com/svn/asterisk/trunk@305248 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
a534391181
commit
e1cff4ff5a
|
@ -447,7 +447,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
|
||||||
; you should have their certificate installed here so the code can
|
; you should have their certificate installed here so the code can
|
||||||
; verify the authenticity of their certificate.
|
; 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
|
; A directory full of CA certificates. The files must be named with
|
||||||
; the CA subject name hash value.
|
; the CA subject name hash value.
|
||||||
; (see man SSL_CTX_load_verify_locations for more info)
|
; (see man SSL_CTX_load_verify_locations for more info)
|
||||||
|
|
|
@ -550,7 +550,7 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
|
||||||
} else if (!strcasecmp(varname, "tlscafile")) {
|
} else if (!strcasecmp(varname, "tlscafile")) {
|
||||||
ast_free(tls_cfg->cafile);
|
ast_free(tls_cfg->cafile);
|
||||||
tls_cfg->cafile = ast_strdup(value);
|
tls_cfg->cafile = ast_strdup(value);
|
||||||
} else if (!strcasecmp(varname, "tlscapath")) {
|
} else if (!strcasecmp(varname, "tlscapath") || !strcasecmp(varname, "tlscadir")) {
|
||||||
ast_free(tls_cfg->capath);
|
ast_free(tls_cfg->capath);
|
||||||
tls_cfg->capath = ast_strdup(value);
|
tls_cfg->capath = ast_strdup(value);
|
||||||
} else if (!strcasecmp(varname, "tlsverifyclient")) {
|
} else if (!strcasecmp(varname, "tlsverifyclient")) {
|
||||||
|
|
Reference in New Issue