diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-02-04 18:16:09 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-02-04 18:16:09 +0000 |
| commit | 12668b6659279a9bead4a82f06a0f4a0785cc402 (patch) | |
| tree | ba1277875fa7147594979dbaf8aff9d863b938f1 /main/tcptls.c | |
| parent | 9e7a10d894945ea60a444ae7781be69f9389e319 (diff) | |
tcptls.c: Made TLS handle a certificate chain file.
Thanks to Guillaume Martres for doing the necessary research to validate
the change.
(closes issue ASTERISK-17727)
Reported by: LN
Patches:
use_certificate_chain.patch (license #5864) patch uploaded by st
documente_certificate_chain.patch (license #6576) patch uploaded by Guillaume Martres
........
Merged revisions 407272 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 407273 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 407274 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/tcptls.c')
| -rw-r--r-- | main/tcptls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index bfa355985..e07f1f1a0 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -393,7 +393,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) if (!ast_strlen_zero(cfg->certfile)) { char *tmpprivate = ast_strlen_zero(cfg->pvtfile) ? cfg->certfile : cfg->pvtfile; - if (SSL_CTX_use_certificate_file(cfg->ssl_ctx, cfg->certfile, SSL_FILETYPE_PEM) == 0) { + if (SSL_CTX_use_certificate_chain_file(cfg->ssl_ctx, cfg->certfile) == 0) { if (!client) { /* Clients don't need a certificate, but if its setup we can use it */ ast_verb(0, "SSL error loading cert file. <%s>\n", cfg->certfile); |