diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-06-02 12:04:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-06-02 12:04:17 -0500 |
| commit | 0b3c9c6289a3e9e3664924132ceb4306087204d2 (patch) | |
| tree | def386b8129169cde7417f568f01418239406abe | |
| parent | 2a6282f4d808989dd06cd4dbfb6db381d6d4af4b (diff) | |
| parent | 5f712e82acc67402cb37c2a45ed8c8617950ab45 (diff) | |
Merge "tcptls.c: Don't use OpenSSL functions when no SSL support is present."
| -rw-r--r-- | main/tcptls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index 338b8bb36..7ead094ac 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -791,6 +791,7 @@ void *ast_tcptls_server_root(void *data) return NULL; } +#ifdef DO_SSL static void __ssl_setup_certs(struct ast_tls_config *cfg, const size_t cert_file_len, const char *key_type_extension, const char *key_type) { char *cert_file = ast_strdupa(cfg->certfile); @@ -806,6 +807,7 @@ static void __ssl_setup_certs(struct ast_tls_config *cfg, const size_t cert_file } } } +#endif static int __ssl_setup(struct ast_tls_config *cfg, int client) { |