Merge "core: Tweak startup order."
[asterisk/asterisk.git] / main / tcptls.c
index 2b48426..02a2af5 100644 (file)
  */
 
 /*** MODULEINFO
+       <use type="external">openssl</use>
        <support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
 #include <signal.h>
-#include <sys/signal.h>
+#include <sys/stat.h>
 
 #include "asterisk/compat.h"
 #include "asterisk/tcptls.h"
+#include "asterisk/io.h"
 #include "asterisk/http.h"
 #include "asterisk/utils.h"
 #include "asterisk/strings.h"
 #include "asterisk/options.h"
 #include "asterisk/manager.h"
 #include "asterisk/astobj2.h"
+#include "asterisk/pbx.h"
+#include "asterisk/app.h"
 
-/*! \brief
- * replacement read/write functions for SSL support.
- * We use wrappers rather than SSL_read/SSL_write directly so
- * we can put in some debugging.
- */
-
-#ifdef DO_SSL
-static HOOK_T ssl_read(void *cookie, char *buf, LEN_T len)
-{
-       int i = SSL_read(cookie, buf, len-1);
-#if 0
-       if (i >= 0) {
-               buf[i] = '\0';
-       }
-       ast_verb(0, "ssl read size %d returns %d <%s>\n", (int)len, i, buf);
-#endif
-       return i;
-}
-
-static HOOK_T ssl_write(void *cookie, const char *buf, LEN_T len)
+static void session_instance_destructor(void *obj)
 {
-#if 0
-       char *s = ast_alloca(len+1);
+       struct ast_tcptls_session_instance *i = obj;
 
-       strncpy(s, buf, len);
-       s[len] = '\0';
-       ast_verb(0, "ssl write size %d <%s>\n", (int)len, s);
-#endif
-       return SSL_write(cookie, buf, len);
+       if (i->stream) {
+               ast_iostream_close(i->stream);
+               i->stream = NULL;
+       }
+       ast_free(i->overflow_buf);
+       ao2_cleanup(i->private_data);
 }
 
-static int ssl_close(void *cookie)
+#ifdef DO_SSL
+static int check_tcptls_cert_name(ASN1_STRING *cert_str, const char *hostname, const char *desc)
 {
-       int cookie_fd = SSL_get_fd(cookie);
+       unsigned char *str;
        int ret;
 
-       if (cookie_fd > -1) {
-               /*
-                * According to the TLS standard, it is acceptable for an application to only send its shutdown
-                * alert and then close the underlying connection without waiting for the peer's response (this
-                * way resources can be saved, as the process can already terminate or serve another connection).
-                */
-               if ((ret = SSL_shutdown(cookie)) < 0) {
-                       ast_log(LOG_ERROR, "SSL_shutdown() failed: %d\n", SSL_get_error(cookie, ret));
-               }
-
-               if (!((SSL*)cookie)->server) {
-                       /* For client threads, ensure that the error stack is cleared */
-                       ERR_remove_state(0);
-               }
-
-               SSL_free(cookie);
-               /* adding shutdown(2) here has no added benefit */
-               if (close(cookie_fd)) {
-                       ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
-               }
-       }
-       return 0;
-}
-#endif /* DO_SSL */
-
-HOOK_T ast_tcptls_server_read(struct ast_tcptls_session_instance *tcptls_session, void *buf, size_t count)
-{
-       if (tcptls_session->fd == -1) {
-               ast_log(LOG_ERROR, "server_read called with an fd of -1\n");
-               errno = EIO;
+       ret = ASN1_STRING_to_UTF8(&str, cert_str);
+       if (ret < 0 || !str) {
                return -1;
        }
 
-#ifdef DO_SSL
-       if (tcptls_session->ssl) {
-               return ssl_read(tcptls_session->ssl, buf, count);
-       }
-#endif
-       return read(tcptls_session->fd, buf, count);
-}
+       if (strlen((char *) str) != ret) {
+               ast_log(LOG_WARNING, "Invalid certificate %s length (contains NULL bytes?)\n", desc);
 
-HOOK_T ast_tcptls_server_write(struct ast_tcptls_session_instance *tcptls_session, const void *buf, size_t count)
-{
-       if (tcptls_session->fd == -1) {
-               ast_log(LOG_ERROR, "server_write called with an fd of -1\n");
-               errno = EIO;
-               return -1;
+               ret = -1;
+       } else if (!strcasecmp(hostname, (char *) str)) {
+               ret = 0;
+       } else {
+               ret = -1;
        }
 
-#ifdef DO_SSL
-       if (tcptls_session->ssl) {
-               return ssl_write(tcptls_session->ssl, buf, count);
-       }
-#endif
-       return write(tcptls_session->fd, buf, count);
-}
+       ast_debug(3, "SSL %s compare s1='%s' s2='%s'\n", desc, hostname, str);
+       OPENSSL_free(str);
 
-static void session_instance_destructor(void *obj)
-{
-       struct ast_tcptls_session_instance *i = obj;
-       ast_free(i->overflow_buf);
+       return ret;
 }
+#endif
 
 /*! \brief
 * creates a FILE * from the fd passed by the accept thread.
@@ -159,113 +102,109 @@ static void *handle_tcptls_connection(void *data)
 {
        struct ast_tcptls_session_instance *tcptls_session = data;
 #ifdef DO_SSL
-       int (*ssl_setup)(SSL *) = (tcptls_session->client) ? SSL_connect : SSL_accept;
-       int ret;
-       char err[256];
+       SSL *ssl;
 #endif
 
-       /*
-       * open a FILE * as appropriate.
-       */
-       if (!tcptls_session->parent->tls_cfg) {
-               if ((tcptls_session->f = fdopen(tcptls_session->fd, "w+"))) {
-                       if(setvbuf(tcptls_session->f, NULL, _IONBF, 0)) {
-                               ast_tcptls_close_session_file(tcptls_session);
-                       }
-               }
+       /* TCP/TLS connections are associated with external protocols, and
+        * should not be allowed to execute 'dangerous' functions. This may
+        * need to be pushed down into the individual protocol handlers, but
+        * this seems like a good general policy.
+        */
+       if (ast_thread_inhibit_escalations()) {
+               ast_log(LOG_ERROR, "Failed to inhibit privilege escalations; killing connection\n");
+               ast_tcptls_close_session_file(tcptls_session);
+               ao2_ref(tcptls_session, -1);
+               return NULL;
        }
+
+       if (tcptls_session->parent->tls_cfg) {
 #ifdef DO_SSL
-       else if ( (tcptls_session->ssl = SSL_new(tcptls_session->parent->tls_cfg->ssl_ctx)) ) {
-               SSL_set_fd(tcptls_session->ssl, tcptls_session->fd);
-               if ((ret = ssl_setup(tcptls_session->ssl)) <= 0) {
-                       ast_verb(2, "Problem setting up ssl connection: %s\n", ERR_error_string(ERR_get_error(), err));
-               } else {
-#if defined(HAVE_FUNOPEN)      /* the BSD interface */
-                       tcptls_session->f = funopen(tcptls_session->ssl, ssl_read, ssl_write, NULL, ssl_close);
-
-#elif defined(HAVE_FOPENCOOKIE)        /* the glibc/linux interface */
-                       static const cookie_io_functions_t cookie_funcs = {
-                               ssl_read, ssl_write, NULL, ssl_close
-                       };
-                       tcptls_session->f = fopencookie(tcptls_session->ssl, "w+", cookie_funcs);
-#else
-                       /* could add other methods here */
-                       ast_debug(2, "no tcptls_session->f methods attempted!\n");
-#endif
-                       if ((tcptls_session->client && !ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_DONT_VERIFY_SERVER))
-                               || (!tcptls_session->client && ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_VERIFY_CLIENT))) {
-                               X509 *peer;
-                               long res;
-                               peer = SSL_get_peer_certificate(tcptls_session->ssl);
-                               if (!peer) {
-                                       ast_log(LOG_ERROR, "No peer SSL certificate to verify\n");
-                                       ast_tcptls_close_session_file(tcptls_session);
-                                       ao2_ref(tcptls_session, -1);
-                                       return NULL;
-                               }
+               if (ast_iostream_start_tls(&tcptls_session->stream, tcptls_session->parent->tls_cfg->ssl_ctx, tcptls_session->client) < 0) {
+                       ast_tcptls_close_session_file(tcptls_session);
+                       ao2_ref(tcptls_session, -1);
+                       return NULL;
+               }
 
-                               res = SSL_get_verify_result(tcptls_session->ssl);
-                               if (res != X509_V_OK) {
-                                       ast_log(LOG_ERROR, "Certificate did not verify: %s\n", X509_verify_cert_error_string(res));
-                                       X509_free(peer);
-                                       ast_tcptls_close_session_file(tcptls_session);
-                                       ao2_ref(tcptls_session, -1);
-                                       return NULL;
+               ssl = ast_iostream_get_ssl(tcptls_session->stream);
+               if ((tcptls_session->client && !ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_DONT_VERIFY_SERVER))
+                       || (!tcptls_session->client && ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_VERIFY_CLIENT))) {
+                       X509 *peer;
+                       long res;
+                       peer = SSL_get_peer_certificate(ssl);
+                       if (!peer) {
+                               ast_log(LOG_ERROR, "No peer SSL certificate to verify\n");
+                               ast_tcptls_close_session_file(tcptls_session);
+                               ao2_ref(tcptls_session, -1);
+                               return NULL;
+                       }
+
+                       res = SSL_get_verify_result(ssl);
+                       if (res != X509_V_OK) {
+                               ast_log(LOG_ERROR, "Certificate did not verify: %s\n", X509_verify_cert_error_string(res));
+                               X509_free(peer);
+                               ast_tcptls_close_session_file(tcptls_session);
+                               ao2_ref(tcptls_session, -1);
+                               return NULL;
+                       }
+                       if (!ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_IGNORE_COMMON_NAME)) {
+                               ASN1_STRING *str;
+                               X509_NAME *name = X509_get_subject_name(peer);
+                               STACK_OF(GENERAL_NAME) *alt_names;
+                               int pos = -1;
+                               int found = 0;
+
+                               for (;;) {
+                                       /* Walk the certificate to check all available "Common Name" */
+                                       /* XXX Probably should do a gethostbyname on the hostname and compare that as well */
+                                       pos = X509_NAME_get_index_by_NID(name, NID_commonName, pos);
+                                       if (pos < 0) {
+                                               break;
+                                       }
+                                       str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, pos));
+                                       if (!check_tcptls_cert_name(str, tcptls_session->parent->hostname, "common name")) {
+                                               found = 1;
+                                               break;
+                                       }
                                }
-                               if (!ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_IGNORE_COMMON_NAME)) {
-                                       ASN1_STRING *str;
-                                       unsigned char *str2;
-                                       X509_NAME *name = X509_get_subject_name(peer);
-                                       int pos = -1;
-                                       int found = 0;
-
-                                       for (;;) {
-                                               /* Walk the certificate to check all available "Common Name" */
-                                               /* XXX Probably should do a gethostbyname on the hostname and compare that as well */
-                                               pos = X509_NAME_get_index_by_NID(name, NID_commonName, pos);
-                                               if (pos < 0) {
-                                                       break;
-                                               }
-                                               str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, pos));
-                                               ASN1_STRING_to_UTF8(&str2, str);
-                                               if (str2) {
-                                                       if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
+
+                               if (!found) {
+                                       alt_names = X509_get_ext_d2i(peer, NID_subject_alt_name, NULL, NULL);
+                                       if (alt_names != NULL) {
+                                               int alt_names_count = sk_GENERAL_NAME_num(alt_names);
+
+                                               for (pos = 0; pos < alt_names_count; pos++) {
+                                                       const GENERAL_NAME *alt_name = sk_GENERAL_NAME_value(alt_names, pos);
+
+                                                       if (alt_name->type != GEN_DNS) {
+                                                               continue;
+                                                       }
+
+                                                       if (!check_tcptls_cert_name(alt_name->d.dNSName, tcptls_session->parent->hostname, "alt name")) {
                                                                found = 1;
+                                                               break;
                                                        }
-                                                       ast_debug(3, "SSL Common Name compare s1='%s' s2='%s'\n", tcptls_session->parent->hostname, str2);
-                                                       OPENSSL_free(str2);
-                                               }
-                                               if (found) {
-                                                       break;
                                                }
-                                       }
-                                       if (!found) {
-                                               ast_log(LOG_ERROR, "Certificate common name did not match (%s)\n", tcptls_session->parent->hostname);
-                                               X509_free(peer);
-                                               ast_tcptls_close_session_file(tcptls_session);
-                                               ao2_ref(tcptls_session, -1);
-                                               return NULL;
+
+                                               sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free);
                                        }
                                }
-                               X509_free(peer);
+
+                               if (!found) {
+                                       ast_log(LOG_ERROR, "Certificate common name did not match (%s)\n", tcptls_session->parent->hostname);
+                                       X509_free(peer);
+                                       ast_tcptls_close_session_file(tcptls_session);
+                                       ao2_ref(tcptls_session, -1);
+                                       return NULL;
+                               }
                        }
+                       X509_free(peer);
                }
-               if (!tcptls_session->f) {       /* no success opening descriptor stacking */
-                       SSL_free(tcptls_session->ssl);
-               }
-       }
-#endif /* DO_SSL */
-
-       if (!tcptls_session->f) {
+#else
+               ast_log(LOG_ERROR, "Attempted a TLS connection without OpenSSL support. This will not work!\n");
                ast_tcptls_close_session_file(tcptls_session);
-               ast_log(LOG_WARNING, "FILE * open failed!\n");
-#ifndef DO_SSL
-               if (tcptls_session->parent->tls_cfg) {
-                       ast_log(LOG_WARNING, "Attempted a TLS connection without OpenSSL support. This will not work!\n");
-               }
-#endif
                ao2_ref(tcptls_session, -1);
                return NULL;
+#endif /* DO_SSL */
        }
 
        if (tcptls_session->parent->worker_fn) {
@@ -284,35 +223,53 @@ void *ast_tcptls_server_root(void *data)
        pthread_t launched;
 
        for (;;) {
-               int i, flags;
+               int i;
 
                if (desc->periodic_fn) {
                        desc->periodic_fn(desc);
                }
                i = ast_wait_for_input(desc->accept_fd, desc->poll_timeout);
                if (i <= 0) {
+                       /* Prevent tight loop from hogging CPU */
+                       usleep(1);
                        continue;
                }
                fd = ast_accept(desc->accept_fd, &addr);
                if (fd < 0) {
-                       if ((errno != EAGAIN) && (errno != EINTR)) {
-                               ast_log(LOG_WARNING, "Accept failed: %s\n", strerror(errno));
+                       if (errno != EAGAIN
+                               && errno != EWOULDBLOCK
+                               && errno != EINTR
+                               && errno != ECONNABORTED) {
+                               ast_log(LOG_ERROR, "TCP/TLS accept failed: %s\n", strerror(errno));
+                               if (errno != EMFILE) {
+                                       break;
+                               }
                        }
+                       /* Prevent tight loop from hogging CPU */
+                       usleep(1);
                        continue;
                }
                tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor);
                if (!tcptls_session) {
-                       ast_log(LOG_WARNING, "No memory for new session: %s\n", strerror(errno));
-                       if (close(fd)) {
-                               ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
-                       }
+                       close(fd);
                        continue;
                }
 
                tcptls_session->overflow_buf = ast_str_create(128);
-               flags = fcntl(fd, F_GETFL);
-               fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
-               tcptls_session->fd = fd;
+               if (!tcptls_session->overflow_buf) {
+                       ao2_ref(tcptls_session, -1);
+                       close(fd);
+                       continue;
+               }
+               ast_fd_clear_flags(fd, O_NONBLOCK);
+
+               tcptls_session->stream = ast_iostream_from_fd(&fd);
+               if (!tcptls_session->stream) {
+                       ao2_ref(tcptls_session, -1);
+                       close(fd);
+                       continue;
+               }
+
                tcptls_session->parent = desc;
                ast_sockaddr_copy(&tcptls_session->remote_address, &addr);
 
@@ -320,20 +277,53 @@ void *ast_tcptls_server_root(void *data)
 
                /* This thread is now the only place that controls the single ref to tcptls_session */
                if (ast_pthread_create_detached_background(&launched, NULL, handle_tcptls_connection, tcptls_session)) {
-                       ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
-                       ast_tcptls_close_session_file(tcptls_session);
+                       ast_log(LOG_ERROR, "TCP/TLS unable to launch helper thread: %s\n",
+                               strerror(errno));
                        ao2_ref(tcptls_session, -1);
                }
        }
+
+       ast_log(LOG_ERROR, "TCP/TLS listener thread ended abnormally\n");
+
+       /* Close the listener socket so Asterisk doesn't appear dead. */
+       fd = desc->accept_fd;
+       desc->accept_fd = -1;
+       if (0 <= fd) {
+               close(fd);
+       }
        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);
+
+       memcpy(cert_file + cert_file_len - 8, key_type_extension, 5);
+       if (access(cert_file, F_OK) == 0) {
+               if (SSL_CTX_use_certificate_chain_file(cfg->ssl_ctx, cert_file) == 0) {
+                       ast_log(LOG_WARNING, "TLS/SSL error loading public %s key (certificate) from <%s>.\n", key_type, cert_file);
+               } else if (SSL_CTX_use_PrivateKey_file(cfg->ssl_ctx, cert_file, SSL_FILETYPE_PEM) == 0) {
+                       ast_log(LOG_WARNING, "TLS/SSL error loading private %s key from <%s>.\n", key_type, cert_file);
+               } else if (SSL_CTX_check_private_key(cfg->ssl_ctx) == 0) {
+                       ast_log(LOG_WARNING, "TLS/SSL error matching private %s key and certificate in <%s>.\n", key_type, cert_file);
+               }
+       }
+}
+#endif
+
 static int __ssl_setup(struct ast_tls_config *cfg, int client)
 {
 #ifndef DO_SSL
-       cfg->enabled = 0;
+       if (cfg->enabled) {
+               ast_log(LOG_NOTICE, "Configured without OpenSSL Development Headers");
+               cfg->enabled = 0;
+       }
        return 0;
 #else
+       int disable_ssl = 0;
+       long ssl_opts = 0;
+
        if (!cfg->enabled) {
                return 0;
        }
@@ -347,24 +337,30 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
        }
 
        if (client) {
-#ifndef OPENSSL_NO_SSL2
+#if !defined(OPENSSL_NO_SSL2) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
                if (ast_test_flag(&cfg->flags, AST_SSL_SSLV2_CLIENT)) {
+                       ast_log(LOG_WARNING, "Usage of SSLv2 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n");
                        cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method());
                } else
 #endif
+#ifndef OPENSSL_NO_SSL3_METHOD
                if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) {
+                       ast_log(LOG_WARNING, "Usage of SSLv3 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n");
                        cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
-               } else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
+               } else
+#endif
+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER  >= 0x10100000L)
+               cfg->ssl_ctx = SSL_CTX_new(TLS_client_method());
+#else
+               if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
                        cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
                } else {
-                       /* SSLv23_client_method() sends SSLv2, this was the original
-                        * default for ssl clients before the option was given to
-                        * pick what protocol a client should use.  In order not
-                        * to break expected behavior it remains the default. */
+                       disable_ssl = 1;
                        cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
                }
+#endif
        } else {
-               /* SSLv23_server_method() supports TLSv1, SSLv2, and SSLv3 inbound connections. */
+               disable_ssl = 1;
                cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
        }
 
@@ -374,16 +370,45 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
                return 0;
        }
 
+       /* Due to the POODLE vulnerability, completely disable
+        * SSLv2 and SSLv3 if we are not explicitly told to use
+        * them. SSLv23_*_method supports TLSv1+.
+        */
+       if (disable_ssl) {
+               ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+       }
+
+       if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
+               ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
+       }
+
+       if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
+               ssl_opts |= SSL_OP_NO_TLSv1;
+       }
+#if defined(HAVE_SSL_OP_NO_TLSV1_1) && defined(HAVE_SSL_OP_NO_TLSV1_2)
+       if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
+               ssl_opts |= SSL_OP_NO_TLSv1_1;
+       }
+       if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
+               ssl_opts |= SSL_OP_NO_TLSv1_2;
+       }
+#else
+       ast_log(LOG_WARNING, "Your version of OpenSSL leaves you potentially vulnerable "
+                       "to the SSL BEAST attack. Please upgrade to OpenSSL 1.0.1 or later\n");
+#endif
+
+       SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
+
        SSL_CTX_set_verify(cfg->ssl_ctx,
                ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
                NULL);
 
        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);
+                               ast_log(LOG_ERROR, "TLS/SSL error loading cert file. <%s>\n", cfg->certfile);
                                cfg->enabled = 0;
                                SSL_CTX_free(cfg->ssl_ctx);
                                cfg->ssl_ctx = NULL;
@@ -393,18 +418,29 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
                if ((SSL_CTX_use_PrivateKey_file(cfg->ssl_ctx, tmpprivate, SSL_FILETYPE_PEM) == 0) || (SSL_CTX_check_private_key(cfg->ssl_ctx) == 0 )) {
                        if (!client) {
                                /* Clients don't need a private key, but if its setup we can use it */
-                               ast_verb(0, "SSL error loading private key file. <%s>\n", tmpprivate);
+                               ast_log(LOG_ERROR, "TLS/SSL error loading private key file. <%s>\n", tmpprivate);
                                cfg->enabled = 0;
                                SSL_CTX_free(cfg->ssl_ctx);
                                cfg->ssl_ctx = NULL;
                                return 0;
                        }
                }
+               if (!client) {
+                       size_t certfile_len = strlen(cfg->certfile);
+
+                       /* expects a file name which contains _rsa. like asterisk_rsa.pem
+                        * ignores any 3-character file-extension like .pem, .cer, .crt
+                        */
+                       if (certfile_len >= 8 && !strncmp(cfg->certfile + certfile_len - 8, "_rsa.", 5)) {
+                               __ssl_setup_certs(cfg, certfile_len, "_ecc.", "ECC");
+                               __ssl_setup_certs(cfg, certfile_len, "_dsa.", "DSA");
+                       }
+               }
        }
        if (!ast_strlen_zero(cfg->cipher)) {
                if (SSL_CTX_set_cipher_list(cfg->ssl_ctx, cfg->cipher) == 0 ) {
                        if (!client) {
-                               ast_verb(0, "SSL cipher error <%s>\n", cfg->cipher);
+                               ast_log(LOG_ERROR, "TLS/SSL cipher error <%s>\n", cfg->cipher);
                                cfg->enabled = 0;
                                SSL_CTX_free(cfg->ssl_ctx);
                                cfg->ssl_ctx = NULL;
@@ -414,11 +450,47 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
        }
        if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
                if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) {
-                       ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
+                       ast_log(LOG_ERROR, "TLS/SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
+               }
+       }
+
+#ifdef HAVE_OPENSSL_EC
+
+       if (!ast_strlen_zero(cfg->pvtfile)) {
+               BIO *bio = BIO_new_file(cfg->pvtfile, "r");
+               if (bio != NULL) {
+                       DH *dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
+                       if (dh != NULL) {
+                               if (SSL_CTX_set_tmp_dh(cfg->ssl_ctx, dh)) {
+                                       long options = SSL_OP_CIPHER_SERVER_PREFERENCE | SSL_OP_SINGLE_DH_USE | SSL_OP_SINGLE_ECDH_USE;
+                                       options = SSL_CTX_set_options(cfg->ssl_ctx, options);
+                                       ast_verb(2, "TLS/SSL DH initialized, PFS cipher-suites enabled\n");
+                               }
+                               DH_free(dh);
+                       }
+                       BIO_free(bio);
+               }
+       }
+       #ifndef SSL_CTRL_SET_ECDH_AUTO
+               #define SSL_CTRL_SET_ECDH_AUTO 94
+       #endif
+       /* SSL_CTX_set_ecdh_auto(cfg->ssl_ctx, on); requires OpenSSL 1.0.2 which wraps: */
+       if (SSL_CTX_ctrl(cfg->ssl_ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL)) {
+               ast_verb(2, "TLS/SSL ECDH initialized (automatic), faster PFS ciphers enabled\n");
+       } else {
+               /* enables AES-128 ciphers, to get AES-256 use NID_secp384r1 */
+               EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+               if (ecdh != NULL) {
+                       if (SSL_CTX_set_tmp_ecdh(cfg->ssl_ctx, ecdh)) {
+                               ast_verb(2, "TLS/SSL ECDH initialized (secp256r1), faster PFS cipher-suites enabled\n");
+                       }
+                       EC_KEY_free(ecdh);
                }
        }
 
-       ast_verb(0, "SSL certificate ok\n");
+#endif /* #ifdef HAVE_OPENSSL_EC */
+
+       ast_verb(2, "TLS/SSL certificate ok\n");        /* We should log which one that is ok. This message doesn't really make sense in production use */
        return 1;
 #endif
 }
@@ -431,7 +503,7 @@ int ast_ssl_setup(struct ast_tls_config *cfg)
 void ast_ssl_teardown(struct ast_tls_config *cfg)
 {
 #ifdef DO_SSL
-       if (cfg->ssl_ctx) {
+       if (cfg && cfg->ssl_ctx) {
                SSL_CTX_free(cfg->ssl_ctx);
                cfg->ssl_ctx = NULL;
        }
@@ -441,7 +513,6 @@ void ast_ssl_teardown(struct ast_tls_config *cfg)
 struct ast_tcptls_session_instance *ast_tcptls_client_start(struct ast_tcptls_session_instance *tcptls_session)
 {
        struct ast_tcptls_session_args *desc;
-       int flags;
 
        if (!(desc = tcptls_session->parent)) {
                goto client_start_error;
@@ -455,8 +526,7 @@ struct ast_tcptls_session_instance *ast_tcptls_client_start(struct ast_tcptls_se
                goto client_start_error;
        }
 
-       flags = fcntl(desc->accept_fd, F_GETFL);
-       fcntl(desc->accept_fd, F_SETFL, flags & ~O_NONBLOCK);
+       ast_fd_clear_flags(desc->accept_fd, O_NONBLOCK);
 
        if (desc->tls_cfg) {
                desc->tls_cfg->enabled = 1;
@@ -477,7 +547,7 @@ client_start_error:
 
 struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_session_args *desc)
 {
-       int x = 1;
+       int fd, x = 1;
        struct ast_tcptls_session_instance *tcptls_session = NULL;
 
        /* Do nothing if nothing has changed */
@@ -493,17 +563,18 @@ struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_s
                close(desc->accept_fd);
        }
 
-       desc->accept_fd = socket(ast_sockaddr_is_ipv6(&desc->remote_address) ?
-                                AF_INET6 : AF_INET, SOCK_STREAM, IPPROTO_TCP);
+       fd = desc->accept_fd = socket(ast_sockaddr_is_ipv6(&desc->remote_address) ?
+                                     AF_INET6 : AF_INET, SOCK_STREAM, IPPROTO_TCP);
        if (desc->accept_fd < 0) {
-               ast_log(LOG_WARNING, "Unable to allocate socket for %s: %s\n",
+               ast_log(LOG_ERROR, "Unable to allocate socket for %s: %s\n",
                        desc->name, strerror(errno));
                return NULL;
        }
 
        /* if a local address was specified, bind to it so the connection will
           originate from the desired address */
-       if (!ast_sockaddr_isnull(&desc->local_address)) {
+       if (!ast_sockaddr_isnull(&desc->local_address) &&
+           !ast_sockaddr_is_any(&desc->local_address)) {
                setsockopt(desc->accept_fd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
                if (ast_bind(desc->accept_fd, &desc->local_address)) {
                        ast_log(LOG_ERROR, "Unable to bind %s to %s: %s\n",
@@ -514,13 +585,21 @@ struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_s
                }
        }
 
-       if (!(tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor))) {
+       tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor);
+       if (!tcptls_session) {
                goto error;
        }
 
        tcptls_session->overflow_buf = ast_str_create(128);
+       if (!tcptls_session->overflow_buf) {
+               goto error;
+       }
        tcptls_session->client = 1;
-       tcptls_session->fd = desc->accept_fd;
+       tcptls_session->stream = ast_iostream_from_fd(&fd);
+       if (!tcptls_session->stream) {
+               goto error;
+       }
+
        tcptls_session->parent = desc;
        tcptls_session->parent->worker_fn = NULL;
        ast_sockaddr_copy(&tcptls_session->remote_address,
@@ -533,19 +612,72 @@ struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_s
 error:
        close(desc->accept_fd);
        desc->accept_fd = -1;
-       if (tcptls_session) {
-               ao2_ref(tcptls_session, -1);
-       }
+       ao2_cleanup(tcptls_session);
        return NULL;
 }
 
 void ast_tcptls_server_start(struct ast_tcptls_session_args *desc)
 {
-       int flags;
        int x = 1;
+       int tls_changed = 0;
+       int sd_socket;
+
+       if (desc->tls_cfg) {
+               char hash[41];
+               char *str = NULL;
+               struct stat st;
+
+               /* Store the hashes of the TLS certificate etc. */
+               if (stat(desc->tls_cfg->certfile, &st) || NULL == (str = ast_read_textfile(desc->tls_cfg->certfile))) {
+                       memset(hash, 0, 41);
+               } else {
+                       ast_sha1_hash(hash, str);
+               }
+               ast_free(str);
+               str = NULL;
+               memcpy(desc->tls_cfg->certhash, hash, 41);
+               if (stat(desc->tls_cfg->pvtfile, &st) || NULL == (str = ast_read_textfile(desc->tls_cfg->pvtfile))) {
+                       memset(hash, 0, 41);
+               } else {
+                       ast_sha1_hash(hash, str);
+               }
+               ast_free(str);
+               str = NULL;
+               memcpy(desc->tls_cfg->pvthash, hash, 41);
+               if (stat(desc->tls_cfg->cafile, &st) || NULL == (str = ast_read_textfile(desc->tls_cfg->cafile))) {
+                       memset(hash, 0, 41);
+               } else {
+                       ast_sha1_hash(hash, str);
+               }
+               ast_free(str);
+               str = NULL;
+               memcpy(desc->tls_cfg->cahash, hash, 41);
+
+               /* Check whether TLS configuration has changed */
+               if (!desc->old_tls_cfg) { /* No previous configuration */
+                       tls_changed = 1;
+                       desc->old_tls_cfg = ast_calloc(1, sizeof(*desc->old_tls_cfg));
+               } else if (memcmp(desc->tls_cfg->certhash, desc->old_tls_cfg->certhash, 41)) {
+                       tls_changed = 1;
+               } else if (memcmp(desc->tls_cfg->pvthash, desc->old_tls_cfg->pvthash, 41)) {
+                       tls_changed = 1;
+               } else if (strcmp(desc->tls_cfg->cipher, desc->old_tls_cfg->cipher)) {
+                       tls_changed = 1;
+               } else if (memcmp(desc->tls_cfg->cahash, desc->old_tls_cfg->cahash, 41)) {
+                       tls_changed = 1;
+               } else if (strcmp(desc->tls_cfg->capath, desc->old_tls_cfg->capath)) {
+                       tls_changed = 1;
+               } else if (memcmp(&desc->tls_cfg->flags, &desc->old_tls_cfg->flags, sizeof(desc->tls_cfg->flags))) {
+                       tls_changed = 1;
+               }
+
+               if (tls_changed) {
+                       ast_debug(1, "Changed parameters for %s found\n", desc->name);
+               }
+       }
 
        /* Do nothing if nothing has changed */
-       if (!ast_sockaddr_cmp(&desc->old_address, &desc->local_address)) {
+       if (!tls_changed && !ast_sockaddr_cmp(&desc->old_address, &desc->local_address)) {
                ast_debug(1, "Nothing changed in %s\n", desc->name);
                return;
        }
@@ -560,6 +692,19 @@ void ast_tcptls_server_start(struct ast_tcptls_session_args *desc)
                pthread_join(desc->master, NULL);
        }
 
+       sd_socket = ast_sd_get_fd(SOCK_STREAM, &desc->local_address);
+
+       if (sd_socket != -1) {
+               if (desc->accept_fd != sd_socket) {
+                       if (desc->accept_fd != -1) {
+                               close(desc->accept_fd);
+                       }
+                       desc->accept_fd = sd_socket;
+               }
+
+               goto systemd_socket_activation;
+       }
+
        if (desc->accept_fd != -1) {
                close(desc->accept_fd);
        }
@@ -589,8 +734,9 @@ void ast_tcptls_server_start(struct ast_tcptls_session_args *desc)
                ast_log(LOG_ERROR, "Unable to listen for %s!\n", desc->name);
                goto error;
        }
-       flags = fcntl(desc->accept_fd, F_GETFL);
-       fcntl(desc->accept_fd, F_SETFL, flags | O_NONBLOCK);
+
+systemd_socket_activation:
+       ast_fd_set_flags(desc->accept_fd, O_NONBLOCK);
        if (ast_pthread_create_background(&desc->master, NULL, desc->accept_fn, desc)) {
                ast_log(LOG_ERROR, "Unable to launch thread for %s on %s: %s\n",
                        desc->name,
@@ -601,6 +747,22 @@ void ast_tcptls_server_start(struct ast_tcptls_session_args *desc)
 
        /* Set current info */
        ast_sockaddr_copy(&desc->old_address, &desc->local_address);
+       if (desc->old_tls_cfg) {
+               ast_free(desc->old_tls_cfg->certfile);
+               ast_free(desc->old_tls_cfg->pvtfile);
+               ast_free(desc->old_tls_cfg->cipher);
+               ast_free(desc->old_tls_cfg->cafile);
+               ast_free(desc->old_tls_cfg->capath);
+               desc->old_tls_cfg->certfile = ast_strdup(desc->tls_cfg->certfile);
+               desc->old_tls_cfg->pvtfile = ast_strdup(desc->tls_cfg->pvtfile);
+               desc->old_tls_cfg->cipher = ast_strdup(desc->tls_cfg->cipher);
+               desc->old_tls_cfg->cafile = ast_strdup(desc->tls_cfg->cafile);
+               desc->old_tls_cfg->capath = ast_strdup(desc->tls_cfg->capath);
+               memcpy(desc->old_tls_cfg->certhash, desc->tls_cfg->certhash, 41);
+               memcpy(desc->old_tls_cfg->pvthash, desc->tls_cfg->pvthash, 41);
+               memcpy(desc->old_tls_cfg->cahash, desc->tls_cfg->cahash, 41);
+               memcpy(&desc->old_tls_cfg->flags, &desc->tls_cfg->flags, sizeof(desc->old_tls_cfg->flags));
+       }
 
        return;
 
@@ -611,19 +773,11 @@ error:
 
 void ast_tcptls_close_session_file(struct ast_tcptls_session_instance *tcptls_session)
 {
-       if (tcptls_session->f) {
-               if (fclose(tcptls_session->f)) {
-                       ast_log(LOG_ERROR, "fclose() failed: %s\n", strerror(errno));
-               }
-               tcptls_session->f = NULL;
-               tcptls_session->fd = -1;
-       } else if (tcptls_session->fd != -1) {
-               if (close(tcptls_session->fd)) {
-                       ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
-               }
-               tcptls_session->fd = -1;
+       if (tcptls_session->stream) {
+               ast_iostream_close(tcptls_session->stream);
+               tcptls_session->stream = NULL;
        } else {
-               ast_log(LOG_ERROR, "ast_tcptls_close_session_file invoked on session instance without file or file descriptor\n");
+               ast_debug(1, "ast_tcptls_close_session_file invoked on session instance without file or file descriptor\n");
        }
 }
 
@@ -639,6 +793,17 @@ void ast_tcptls_server_stop(struct ast_tcptls_session_args *desc)
                close(desc->accept_fd);
        }
        desc->accept_fd = -1;
+
+       if (desc->old_tls_cfg) {
+               ast_free(desc->old_tls_cfg->certfile);
+               ast_free(desc->old_tls_cfg->pvtfile);
+               ast_free(desc->old_tls_cfg->cipher);
+               ast_free(desc->old_tls_cfg->cafile);
+               ast_free(desc->old_tls_cfg->capath);
+               ast_free(desc->old_tls_cfg);
+               desc->old_tls_cfg = NULL;
+       }
+
        ast_debug(2, "Stopped server :: %s\n", desc->name);
 }
 
@@ -667,7 +832,7 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
                ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DONT_VERIFY_SERVER);
        } else if (!strcasecmp(varname, "tlsbindaddr") || !strcasecmp(varname, "sslbindaddr")) {
                if (ast_parse_arg(value, PARSE_ADDR, &tls_desc->local_address))
-                       ast_log(LOG_WARNING, "Invalid %s '%s'\n", varname, value);
+                       ast_log(LOG_ERROR, "Invalid %s '%s'\n", varname, value);
        } else if (!strcasecmp(varname, "tlsclientmethod") || !strcasecmp(varname, "sslclientmethod")) {
                if (!strcasecmp(value, "tlsv1")) {
                        ast_set_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
@@ -682,6 +847,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
                        ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
                        ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
                }
+       } else if (!strcasecmp(varname, "tlsservercipherorder")) {
+               ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
+       } else if (!strcasecmp(varname, "tlsdisablev1")) {
+               ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
+       } else if (!strcasecmp(varname, "tlsdisablev11")) {
+               ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
+       } else if (!strcasecmp(varname, "tlsdisablev12")) {
+               ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
        } else {
                return -1;
        }