diff options
| author | Joshua Elson <joshelson@gmail.com> | 2017-02-15 13:44:32 -0700 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2017-02-16 05:48:41 -0600 |
| commit | ac7a34c531a15c4dfb992cf5608e6b9d1e6d7c35 (patch) | |
| tree | 51ab7e107038af6f0c92135b72dbd6ca4c767dc6 /main/http.c | |
| parent | ca7fa7bbd2d54766f6b5911d7aa046cdcfd0dfe8 (diff) | |
http: Ensure capath is defined on all http creations
ASTERISK-26794 #close
Change-Id: I9cbc3b6b6a8aab590f5ccde9c262a98e4d5253a1
Diffstat (limited to 'main/http.c')
| -rw-r--r-- | main/http.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/main/http.c b/main/http.c index 5f57b1eb0..0db6ee7b6 100644 --- a/main/http.c +++ b/main/http.c @@ -2056,22 +2056,20 @@ static int __ast_http_load(int reload) http_tls_was_enabled = (reload && http_tls_cfg.enabled); http_tls_cfg.enabled = 0; - if (http_tls_cfg.certfile) { - ast_free(http_tls_cfg.certfile); - } + + ast_free(http_tls_cfg.certfile); http_tls_cfg.certfile = ast_strdup(AST_CERTFILE); - if (http_tls_cfg.pvtfile) { - ast_free(http_tls_cfg.pvtfile); - } + ast_free(http_tls_cfg.capath); + http_tls_cfg.capath = ast_strdup(""); + + ast_free(http_tls_cfg.pvtfile); http_tls_cfg.pvtfile = ast_strdup(""); /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER); - if (http_tls_cfg.cipher) { - ast_free(http_tls_cfg.cipher); - } + ast_free(http_tls_cfg.cipher); http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA"); AST_RWLIST_WRLOCK(&uri_redirects); @@ -2285,6 +2283,7 @@ static void http_shutdown(void) ast_tcptls_server_stop(&https_desc); } ast_free(http_tls_cfg.certfile); + ast_free(http_tls_cfg.capath); ast_free(http_tls_cfg.pvtfile); ast_free(http_tls_cfg.cipher); |