[svn-commits] oej: trunk r343492 - in /trunk: include/asterisk/tcptls.h main/tcptls.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Nov 6 03:51:13 CST 2011
Author: oej
Date: Sun Nov 6 03:51:09 2011
New Revision: 343492
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=343492
Log:
Formatting and doxygen improvements
Modified:
trunk/include/asterisk/tcptls.h
trunk/main/tcptls.c
Modified: trunk/include/asterisk/tcptls.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/tcptls.h?view=diff&rev=343492&r1=343491&r2=343492
==============================================================================
--- trunk/include/asterisk/tcptls.h (original)
+++ trunk/include/asterisk/tcptls.h Sun Nov 6 03:51:09 2011
@@ -25,8 +25,10 @@
* in or out the DO_SSL macro.
*
* TLS/SSL support is basically implemented by reading from a config file
- * (currently http.conf and sip.conf) the names of the certificate and cipher to use,
- * and then run ssl_setup() to create an appropriate SSL_CTX (ssl_ctx)
+ * (currently manager.conf, http.conf and sip.conf) the names of the certificate
+ * files and cipher to use, and then run ssl_setup() to create an appropriate
+ * data structure named ssl_ctx.
+ *
* If we support multiple domains, presumably we need to read multiple
* certificates.
*
@@ -42,6 +44,11 @@
* and their setup should be moved to a more central place, e.g. asterisk.conf
* and the source files that processes it. Similarly, ssl_setup() should
* be run earlier in the startup process so modules have it available.
+ *
+ * \ref AstTlsOverview
+ *
+ * \todo For SIP, the SubjectAltNames should be checked on verification
+ * of the certificate. (Check RFC 5922)
*
*/
@@ -93,7 +100,8 @@
SSL_CTX *ssl_ctx;
};
-/*!
+/*! \page AstTlsOverview TLS Implementation Overview
+ *
* The following code implements a generic mechanism for starting
* services on a TCP or TLS socket.
* The service is configured in the struct session_args, and
@@ -135,13 +143,13 @@
const char *name;
};
-/*
+/*! \brief
* describes a server instance
*/
struct ast_tcptls_session_instance {
- FILE *f; /* fopen/funopen result */
- int fd; /* the socket returned by accept() */
- SSL *ssl; /* ssl state */
+ FILE *f; /*!< fopen/funopen result */
+ int fd; /*!< the socket returned by accept() */
+ SSL *ssl; /*!< ssl state */
/* iint (*ssl_setup)(SSL *); */
int client;
struct ast_sockaddr remote_address;
Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=343492&r1=343491&r2=343492
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Sun Nov 6 03:51:09 2011
@@ -56,8 +56,9 @@
{
int i = SSL_read(cookie, buf, len-1);
#if 0
- if (i >= 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;
@@ -67,6 +68,7 @@
{
#if 0
char *s = alloca(len+1);
+
strncpy(s, buf, len);
s[len] = '\0';
ast_verb(0, "ssl write size %d <%s>\n", (int)len, s);
@@ -92,8 +94,9 @@
}
#ifdef DO_SSL
- if (tcptls_session->ssl)
+ if (tcptls_session->ssl) {
return ssl_read(tcptls_session->ssl, buf, count);
+ }
#endif
return read(tcptls_session->fd, buf, count);
}
@@ -107,8 +110,9 @@
}
#ifdef DO_SSL
- if (tcptls_session->ssl)
+ if (tcptls_session->ssl) {
return ssl_write(tcptls_session->ssl, buf, count);
+ }
#endif
return write(tcptls_session->fd, buf, count);
}
@@ -169,11 +173,13 @@
X509 *peer;
long res;
peer = SSL_get_peer_certificate(tcptls_session->ssl);
- if (!peer)
+ if (!peer) {
ast_log(LOG_WARNING, "No peer SSL certificate\n");
+ }
res = SSL_get_verify_result(tcptls_session->ssl);
- if (res != X509_V_OK)
+ if (res != X509_V_OK) {
ast_log(LOG_ERROR, "Certificate did not verify: %s\n", X509_verify_cert_error_string(res));
+ }
if (!ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_IGNORE_COMMON_NAME)) {
ASN1_STRING *str;
unsigned char *str2;
@@ -185,36 +191,42 @@
/* 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)
+ 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 (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
found = 1;
+ }
ast_debug(3, "SSL Common Name compare s1='%s' s2='%s'\n", tcptls_session->parent->hostname, str2);
OPENSSL_free(str2);
}
- if (found)
+ if (found) {
break;
+ }
}
if (!found) {
ast_log(LOG_ERROR, "Certificate common name did not match (%s)\n", tcptls_session->parent->hostname);
- if (peer)
+ if (peer) {
X509_free(peer);
+ }
close(tcptls_session->fd);
fclose(tcptls_session->f);
ao2_ref(tcptls_session, -1);
return NULL;
}
}
- if (peer)
+ if (peer) {
X509_free(peer);
+ }
}
}
- if (!tcptls_session->f) /* no success opening descriptor stacking */
+ if (!tcptls_session->f) { /* no success opening descriptor stacking */
SSL_free(tcptls_session->ssl);
- }
+ }
+ }
#endif /* DO_SSL */
if (!tcptls_session->f) {
@@ -222,17 +234,18 @@
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");
+ ast_log(LOG_WARNING, "Attempted a TLS connection without OpenSSL support. This will not work!\n");
}
#endif
ao2_ref(tcptls_session, -1);
return NULL;
}
- if (tcptls_session && tcptls_session->parent->worker_fn)
+ if (tcptls_session && tcptls_session->parent->worker_fn) {
return tcptls_session->parent->worker_fn(tcptls_session);
- else
+ } else {
return tcptls_session;
+ }
}
void *ast_tcptls_server_root(void *data)
@@ -246,15 +259,18 @@
for (;;) {
int i, flags;
- if (desc->periodic_fn)
+ if (desc->periodic_fn) {
desc->periodic_fn(desc);
+ }
i = ast_wait_for_input(desc->accept_fd, desc->poll_timeout);
- if (i <= 0)
+ if (i <= 0) {
continue;
+ }
fd = ast_accept(desc->accept_fd, &addr);
if (fd < 0) {
- if ((errno != EAGAIN) && (errno != EINTR))
+ if ((errno != EAGAIN) && (errno != EINTR)) {
ast_log(LOG_WARNING, "Accept failed: %s\n", strerror(errno));
+ }
continue;
}
tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor);
@@ -290,8 +306,9 @@
cfg->enabled = 0;
return 0;
#else
- if (!cfg->enabled)
+ if (!cfg->enabled) {
return 0;
+ }
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
@@ -355,8 +372,9 @@
}
}
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)
+ 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_verb(0, "SSL certificate ok\n");
@@ -420,8 +438,9 @@
/* If we return early, there is no connection */
ast_sockaddr_setnull(&desc->old_address);
- if (desc->accept_fd != -1)
+ if (desc->accept_fd != -1) {
close(desc->accept_fd);
+ }
desc->accept_fd = socket(ast_sockaddr_is_ipv6(&desc->remote_address) ?
AF_INET6 : AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -444,8 +463,9 @@
}
}
- if (!(tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor)))
+ if (!(tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor))) {
goto error;
+ }
ast_mutex_init(&tcptls_session->lock);
tcptls_session->client = 1;
@@ -462,8 +482,9 @@
error:
close(desc->accept_fd);
desc->accept_fd = -1;
- if (tcptls_session)
+ if (tcptls_session) {
ao2_ref(tcptls_session, -1);
+ }
return NULL;
}
@@ -488,8 +509,9 @@
pthread_join(desc->master, NULL);
}
- if (desc->accept_fd != -1)
+ if (desc->accept_fd != -1) {
close(desc->accept_fd);
+ }
/* If there's no new server, stop here */
if (ast_sockaddr_isnull(&desc->local_address)) {
@@ -544,8 +566,9 @@
pthread_join(desc->master, NULL);
desc->master = AST_PTHREADT_NULL;
}
- if (desc->accept_fd != -1)
+ if (desc->accept_fd != -1) {
close(desc->accept_fd);
+ }
desc->accept_fd = -1;
ast_debug(2, "Stopped server :: %s\n", desc->name);
}
More information about the svn-commits
mailing list