Merge "core: Tweak startup order."
[asterisk/asterisk.git] / main / tcptls.c
index 338b8bb..02a2af5 100644 (file)
  */
 
 /*** MODULEINFO
+       <use type="external">openssl</use>
        <support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #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"
@@ -49,507 +49,15 @@ ASTERISK_REGISTER_FILE()
 #include "asterisk/manager.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/pbx.h"
-
-/*! ao2 object used for the FILE stream fopencookie()/funopen() cookie. */
-struct ast_tcptls_stream {
-       /*! SSL state if not NULL */
-       SSL *ssl;
-       /*!
-        * \brief Start time from when an I/O sequence must complete
-        * by struct ast_tcptls_stream.timeout.
-        *
-        * \note If struct ast_tcptls_stream.start.tv_sec is zero then
-        * start time is the current I/O request.
-        */
-       struct timeval start;
-       /*!
-        * \brief The socket returned by accept().
-        *
-        * \note Set to -1 if the stream is closed.
-        */
-       int fd;
-       /*!
-        * \brief Timeout in ms relative to struct ast_tcptls_stream.start
-        * to wait for an event on struct ast_tcptls_stream.fd.
-        *
-        * \note Set to -1 to disable timeout.
-        * \note The socket needs to be set to non-blocking for the timeout
-        * feature to work correctly.
-        */
-       int timeout;
-       /*! TRUE if stream can exclusively wait for fd input. */
-       int exclusive_input;
-};
-
-void ast_tcptls_stream_set_timeout_disable(struct ast_tcptls_stream *stream)
-{
-       ast_assert(stream != NULL);
-
-       stream->timeout = -1;
-}
-
-void ast_tcptls_stream_set_timeout_inactivity(struct ast_tcptls_stream *stream, int timeout)
-{
-       ast_assert(stream != NULL);
-
-       stream->start.tv_sec = 0;
-       stream->timeout = timeout;
-}
-
-void ast_tcptls_stream_set_timeout_sequence(struct ast_tcptls_stream *stream, struct timeval start, int timeout)
-{
-       ast_assert(stream != NULL);
-
-       stream->start = start;
-       stream->timeout = timeout;
-}
-
-void ast_tcptls_stream_set_exclusive_input(struct ast_tcptls_stream *stream, int exclusive_input)
-{
-       ast_assert(stream != NULL);
-
-       stream->exclusive_input = exclusive_input;
-}
-
-/*!
- * \internal
- * \brief fopencookie()/funopen() stream read function.
- *
- * \param cookie Stream control data.
- * \param buf Where to put read data.
- * \param size Size of the buffer.
- *
- * \retval number of bytes put into buf.
- * \retval 0 on end of file.
- * \retval -1 on error.
- */
-static HOOK_T tcptls_stream_read(void *cookie, char *buf, LEN_T size)
-{
-       struct ast_tcptls_stream *stream = cookie;
-       struct timeval start;
-       int ms;
-       int res;
-
-       if (!size) {
-               /* You asked for no data you got no data. */
-               return 0;
-       }
-
-       if (!stream || stream->fd == -1) {
-               errno = EBADF;
-               return -1;
-       }
-
-       if (stream->start.tv_sec) {
-               start = stream->start;
-       } else {
-               start = ast_tvnow();
-       }
-
-#if defined(DO_SSL)
-       if (stream->ssl) {
-               for (;;) {
-                       res = SSL_read(stream->ssl, buf, size);
-                       if (0 < res) {
-                               /* We read some payload data. */
-                               return res;
-                       }
-                       switch (SSL_get_error(stream->ssl, res)) {
-                       case SSL_ERROR_ZERO_RETURN:
-                               /* Report EOF for a shutdown */
-                               ast_debug(1, "TLS clean shutdown alert reading data\n");
-                               return 0;
-                       case SSL_ERROR_WANT_READ:
-                               if (!stream->exclusive_input) {
-                                       /* We cannot wait for data now. */
-                                       errno = EAGAIN;
-                                       return -1;
-                               }
-                               while ((ms = ast_remaining_ms(start, stream->timeout))) {
-                                       res = ast_wait_for_input(stream->fd, ms);
-                                       if (0 < res) {
-                                               /* Socket is ready to be read. */
-                                               break;
-                                       }
-                                       if (res < 0) {
-                                               if (errno == EINTR || errno == EAGAIN) {
-                                                       /* Try again. */
-                                                       continue;
-                                               }
-                                               ast_debug(1, "TLS socket error waiting for read data: %s\n",
-                                                       strerror(errno));
-                                               return -1;
-                                       }
-                               }
-                               break;
-                       case SSL_ERROR_WANT_WRITE:
-                               while ((ms = ast_remaining_ms(start, stream->timeout))) {
-                                       res = ast_wait_for_output(stream->fd, ms);
-                                       if (0 < res) {
-                                               /* Socket is ready to be written. */
-                                               break;
-                                       }
-                                       if (res < 0) {
-                                               if (errno == EINTR || errno == EAGAIN) {
-                                                       /* Try again. */
-                                                       continue;
-                                               }
-                                               ast_debug(1, "TLS socket error waiting for write space: %s\n",
-                                                       strerror(errno));
-                                               return -1;
-                                       }
-                               }
-                               break;
-                       default:
-                               /* Report EOF for an undecoded SSL or transport error. */
-                               ast_debug(1, "TLS transport or SSL error reading data\n");
-                               return 0;
-                       }
-                       if (!ms) {
-                               /* Report EOF for a timeout */
-                               ast_debug(1, "TLS timeout reading data\n");
-                               return 0;
-                       }
-               }
-       }
-#endif /* defined(DO_SSL) */
-
-       for (;;) {
-               res = read(stream->fd, buf, size);
-               if (0 <= res || !stream->exclusive_input) {
-                       /* Got data or we cannot wait for it. */
-                       return res;
-               }
-               if (errno != EINTR && errno != EAGAIN) {
-                       /* Not a retryable error. */
-                       ast_debug(1, "TCP socket error reading data: %s\n",
-                               strerror(errno));
-                       return -1;
-               }
-               ms = ast_remaining_ms(start, stream->timeout);
-               if (!ms) {
-                       /* Report EOF for a timeout */
-                       ast_debug(1, "TCP timeout reading data\n");
-                       return 0;
-               }
-               ast_wait_for_input(stream->fd, ms);
-       }
-}
-
-/*!
- * \internal
- * \brief fopencookie()/funopen() stream write function.
- *
- * \param cookie Stream control data.
- * \param buf Where to get data to write.
- * \param size Size of the buffer.
- *
- * \retval number of bytes written from buf.
- * \retval -1 on error.
- */
-static HOOK_T tcptls_stream_write(void *cookie, const char *buf, LEN_T size)
-{
-       struct ast_tcptls_stream *stream = cookie;
-       struct timeval start;
-       int ms;
-       int res;
-       int written;
-       int remaining;
-
-       if (!size) {
-               /* You asked to write no data you wrote no data. */
-               return 0;
-       }
-
-       if (!stream || stream->fd == -1) {
-               errno = EBADF;
-               return -1;
-       }
-
-       if (stream->start.tv_sec) {
-               start = stream->start;
-       } else {
-               start = ast_tvnow();
-       }
-
-#if defined(DO_SSL)
-       if (stream->ssl) {
-               written = 0;
-               remaining = size;
-               for (;;) {
-                       res = SSL_write(stream->ssl, buf + written, remaining);
-                       if (res == remaining) {
-                               /* Everything was written. */
-                               return size;
-                       }
-                       if (0 < res) {
-                               /* Successfully wrote part of the buffer.  Try to write the rest. */
-                               written += res;
-                               remaining -= res;
-                               continue;
-                       }
-                       switch (SSL_get_error(stream->ssl, res)) {
-                       case SSL_ERROR_ZERO_RETURN:
-                               ast_debug(1, "TLS clean shutdown alert writing data\n");
-                               if (written) {
-                                       /* Report partial write. */
-                                       return written;
-                               }
-                               errno = EBADF;
-                               return -1;
-                       case SSL_ERROR_WANT_READ:
-                               ms = ast_remaining_ms(start, stream->timeout);
-                               if (!ms) {
-                                       /* Report partial write. */
-                                       ast_debug(1, "TLS timeout writing data (want read)\n");
-                                       return written;
-                               }
-                               ast_wait_for_input(stream->fd, ms);
-                               break;
-                       case SSL_ERROR_WANT_WRITE:
-                               ms = ast_remaining_ms(start, stream->timeout);
-                               if (!ms) {
-                                       /* Report partial write. */
-                                       ast_debug(1, "TLS timeout writing data (want write)\n");
-                                       return written;
-                               }
-                               ast_wait_for_output(stream->fd, ms);
-                               break;
-                       default:
-                               /* Undecoded SSL or transport error. */
-                               ast_debug(1, "TLS transport or SSL error writing data\n");
-                               if (written) {
-                                       /* Report partial write. */
-                                       return written;
-                               }
-                               errno = EBADF;
-                               return -1;
-                       }
-               }
-       }
-#endif /* defined(DO_SSL) */
-
-       written = 0;
-       remaining = size;
-       for (;;) {
-               res = write(stream->fd, buf + written, remaining);
-               if (res == remaining) {
-                       /* Yay everything was written. */
-                       return size;
-               }
-               if (0 < res) {
-                       /* Successfully wrote part of the buffer.  Try to write the rest. */
-                       written += res;
-                       remaining -= res;
-                       continue;
-               }
-               if (errno != EINTR && errno != EAGAIN) {
-                       /* Not a retryable error. */
-                       ast_debug(1, "TCP socket error writing: %s\n", strerror(errno));
-                       if (written) {
-                               return written;
-                       }
-                       return -1;
-               }
-               ms = ast_remaining_ms(start, stream->timeout);
-               if (!ms) {
-                       /* Report partial write. */
-                       ast_debug(1, "TCP timeout writing data\n");
-                       return written;
-               }
-               ast_wait_for_output(stream->fd, ms);
-       }
-}
-
-/*!
- * \internal
- * \brief fopencookie()/funopen() stream close function.
- *
- * \param cookie Stream control data.
- *
- * \retval 0 on success.
- * \retval -1 on error.
- */
-static int tcptls_stream_close(void *cookie)
-{
-       struct ast_tcptls_stream *stream = cookie;
-
-       if (!stream) {
-               errno = EBADF;
-               return -1;
-       }
-
-       if (stream->fd != -1) {
-#if defined(DO_SSL)
-               if (stream->ssl) {
-                       int res;
-
-                       /*
-                        * 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).
-                        */
-                       res = SSL_shutdown(stream->ssl);
-                       if (res < 0) {
-                               ast_log(LOG_ERROR, "SSL_shutdown() failed: %d\n",
-                                       SSL_get_error(stream->ssl, res));
-                       }
-
-                       if (!stream->ssl->server) {
-                               /* For client threads, ensure that the error stack is cleared */
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-                               ERR_remove_thread_state(NULL);
-#else
-                               ERR_remove_state(0);
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10000000L */
-                       }
-
-                       SSL_free(stream->ssl);
-                       stream->ssl = NULL;
-               }
-#endif /* defined(DO_SSL) */
-
-               /*
-                * Issuing shutdown() is necessary here to avoid a race
-                * condition where the last data written may not appear
-                * in the TCP stream.  See ASTERISK-23548
-                */
-               shutdown(stream->fd, SHUT_RDWR);
-               if (close(stream->fd)) {
-                       ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
-               }
-               stream->fd = -1;
-       }
-       ao2_t_ref(stream, -1, "Closed tcptls stream cookie");
-
-       return 0;
-}
-
-/*!
- * \internal
- * \brief fopencookie()/funopen() stream destructor function.
- *
- * \param cookie Stream control data.
- *
- * \return Nothing
- */
-static void tcptls_stream_dtor(void *cookie)
-{
-#ifdef AST_DEVMODE
-       /* Since the ast_assert below is the only one using stream,
-        * and ast_assert is only available with AST_DEVMODE, we
-        * put this in a conditional to avoid compiler warnings. */
-       struct ast_tcptls_stream *stream = cookie;
-#endif
-
-       ast_assert(stream->fd == -1);
-}
-
-/*!
- * \internal
- * \brief fopencookie()/funopen() stream allocation function.
- *
- * \retval stream_cookie on success.
- * \retval NULL on error.
- */
-static struct ast_tcptls_stream *tcptls_stream_alloc(void)
-{
-       struct ast_tcptls_stream *stream;
-
-       stream = ao2_alloc_options(sizeof(*stream), tcptls_stream_dtor,
-               AO2_ALLOC_OPT_LOCK_NOLOCK);
-       if (stream) {
-               stream->fd = -1;
-               stream->timeout = -1;
-       }
-       return stream;
-}
-
-/*!
- * \internal
- * \brief Open a custom FILE stream for tcptls.
- *
- * \param stream Stream cookie control data.
- * \param ssl SSL state if not NULL.
- * \param fd Socket file descriptor.
- * \param timeout ms to wait for an event on fd. -1 if timeout disabled.
- *
- * \retval fp on success.
- * \retval NULL on error.
- */
-static FILE *tcptls_stream_fopen(struct ast_tcptls_stream *stream, SSL *ssl, int fd, int timeout)
-{
-       FILE *fp;
-
-#if defined(HAVE_FOPENCOOKIE)  /* the glibc/linux interface */
-       static const cookie_io_functions_t cookie_funcs = {
-               tcptls_stream_read,
-               tcptls_stream_write,
-               NULL,
-               tcptls_stream_close
-       };
-#endif /* defined(HAVE_FOPENCOOKIE) */
-
-       if (fd == -1) {
-               /* Socket not open. */
-               return NULL;
-       }
-
-       stream->ssl = ssl;
-       stream->fd = fd;
-       stream->timeout = timeout;
-       ao2_t_ref(stream, +1, "Opening tcptls stream cookie");
-
-#if defined(HAVE_FUNOPEN)      /* the BSD interface */
-       fp = funopen(stream, tcptls_stream_read, tcptls_stream_write, NULL,
-               tcptls_stream_close);
-#elif defined(HAVE_FOPENCOOKIE)        /* the glibc/linux interface */
-       fp = fopencookie(stream, "w+", cookie_funcs);
-#else
-       /* could add other methods here */
-       ast_debug(2, "No stream FILE methods attempted!\n");
-       fp = NULL;
-#endif
-
-       if (!fp) {
-               stream->fd = -1;
-               ao2_t_ref(stream, -1, "Failed to open tcptls stream cookie");
-       }
-       return fp;
-}
-
-HOOK_T ast_tcptls_server_read(struct ast_tcptls_session_instance *tcptls_session, void *buf, size_t count)
-{
-       if (!tcptls_session->stream_cookie || tcptls_session->stream_cookie->fd == -1) {
-               ast_log(LOG_ERROR, "TCP/TLS read called on invalid stream.\n");
-               errno = EIO;
-               return -1;
-       }
-
-       return tcptls_stream_read(tcptls_session->stream_cookie, buf, count);
-}
-
-HOOK_T ast_tcptls_server_write(struct ast_tcptls_session_instance *tcptls_session, const void *buf, size_t count)
-{
-       if (!tcptls_session->stream_cookie || tcptls_session->stream_cookie->fd == -1) {
-               ast_log(LOG_ERROR, "TCP/TLS write called on invalid stream.\n");
-               errno = EIO;
-               return -1;
-       }
-
-       return tcptls_stream_write(tcptls_session->stream_cookie, buf, count);
-}
+#include "asterisk/app.h"
 
 static void session_instance_destructor(void *obj)
 {
        struct ast_tcptls_session_instance *i = obj;
 
-       if (i->stream_cookie) {
-               ao2_t_ref(i->stream_cookie, -1, "Destroying tcptls session instance");
-               i->stream_cookie = NULL;
+       if (i->stream) {
+               ast_iostream_close(i->stream);
+               i->stream = NULL;
        }
        ast_free(i->overflow_buf);
        ao2_cleanup(i->private_data);
@@ -594,9 +102,7 @@ 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
 
        /* TCP/TLS connections are associated with external protocols, and
@@ -611,123 +117,94 @@ static void *handle_tcptls_connection(void *data)
                return NULL;
        }
 
-       tcptls_session->stream_cookie = tcptls_stream_alloc();
-       if (!tcptls_session->stream_cookie) {
-               ast_tcptls_close_session_file(tcptls_session);
-               ao2_ref(tcptls_session, -1);
-               return NULL;
-       }
+       if (tcptls_session->parent->tls_cfg) {
+#ifdef DO_SSL
+               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;
+               }
 
-       /*
-       * open a FILE * as appropriate.
-       */
-       if (!tcptls_session->parent->tls_cfg) {
-               tcptls_session->f = tcptls_stream_fopen(tcptls_session->stream_cookie, NULL,
-                       tcptls_session->fd, -1);
-               if (tcptls_session->f) {
-                       if (setvbuf(tcptls_session->f, NULL, _IONBF, 0)) {
+               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;
                        }
-               }
-       }
-#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_log(LOG_ERROR, "Problem setting up ssl connection: %s\n", ERR_error_string(ERR_get_error(), err));
-               } else if ((tcptls_session->f = tcptls_stream_fopen(tcptls_session->stream_cookie,
-                       tcptls_session->ssl, tcptls_session->fd, -1))) {
-                       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;
-                               }
-
-                               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;
-                               }
-                               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;
-                                               }
+                       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 (!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 (!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);
 
-                                                               if (alt_name->type != GEN_DNS) {
-                                                                       continue;
-                                                               }
+                                               for (pos = 0; pos < alt_names_count; pos++) {
+                                                       const GENERAL_NAME *alt_name = sk_GENERAL_NAME_value(alt_names, pos);
 
-                                                               if (!check_tcptls_cert_name(alt_name->d.dNSName, tcptls_session->parent->hostname, "alt name")) {
-                                                                       found = 1;
-                                                                       break;
-                                                               }
+                                                       if (alt_name->type != GEN_DNS) {
+                                                               continue;
                                                        }
 
-                                                       sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free);
+                                                       if (!check_tcptls_cert_name(alt_name->d.dNSName, tcptls_session->parent->hostname, "alt name")) {
+                                                               found = 1;
+                                                               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_ERROR, "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) {
@@ -746,36 +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 != EWOULDBLOCK) && (errno != EINTR) && (errno != ECONNABORTED)) {
-                               ast_log(LOG_ERROR, "Accept failed: %s\n", strerror(errno));
-                               break;
+                       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);
 
@@ -783,14 +277,24 @@ 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_ERROR, "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);
@@ -806,15 +310,20 @@ 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)
 {
 #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;
        }
@@ -828,7 +337,7 @@ 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());
@@ -840,12 +349,16 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
                        cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
                } 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 {
                        disable_ssl = 1;
                        cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
                }
+#endif
        } else {
                disable_ssl = 1;
                cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
@@ -862,12 +375,30 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
         * them. SSLv23_*_method supports TLSv1+.
         */
        if (disable_ssl) {
-               long ssl_opts;
+               ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+       }
 
-               ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-               SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
+       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);
@@ -972,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;
        }
@@ -982,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;
@@ -996,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;
@@ -1018,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 */
@@ -1034,8 +563,8 @@ 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_ERROR, "Unable to allocate socket for %s: %s\n",
                        desc->name, strerror(errno));
@@ -1044,7 +573,8 @@ struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_s
 
        /* 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",
@@ -1055,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,
@@ -1074,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;
        }
@@ -1101,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);
        }
@@ -1130,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,
@@ -1142,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;
 
@@ -1152,26 +773,11 @@ error:
 
 void ast_tcptls_close_session_file(struct ast_tcptls_session_instance *tcptls_session)
 {
-       if (tcptls_session->f) {
-               fflush(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) {
-               /*
-                * Issuing shutdown() is necessary here to avoid a race
-                * condition where the last data written may not appear
-                * in the TCP stream.  See ASTERISK-23548
-                */
-               shutdown(tcptls_session->fd, SHUT_RDWR);
-               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");
        }
 }
 
@@ -1187,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);
 }
 
@@ -1230,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;
        }