[Asterisk-code-review] tcptls.h: Repair ./configure --with-ssl=PATH. (asterisk[13])
George Joseph
asteriskteam at digium.com
Tue Jun 5 14:20:39 CDT 2018
George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/9059 )
Change subject: tcptls.h: Repair ./configure --with-ssl=PATH.
......................................................................
tcptls.h: Repair ./configure --with-ssl=PATH.
asterisk/tcptls.h was included (explicitly, implicitly, or transitively). Those
inclusions got replaced by forward declarations. As side effect, the inclusions
got completed.
ASTERISK-27878
Change-Id: I9d102728e30336d6522e5e4ae9e964013a0835f7
---
M include/asterisk/tcptls.h
M main/tcptls.c
2 files changed, 52 insertions(+), 37 deletions(-)
Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
index b476829..87e37a8 100644
--- a/include/asterisk/tcptls.h
+++ b/include/asterisk/tcptls.h
@@ -46,31 +46,27 @@
* 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)
- *
*/
#ifndef _ASTERISK_TCPTLS_H
#define _ASTERISK_TCPTLS_H
-#include "asterisk/netsock2.h"
-#include "asterisk/utils.h"
+#include "asterisk.h"
+
+#include <pthread.h> /* for pthread_t */
+
+#include "asterisk/netsock2.h" /* for ast_sockaddr */
+#include "asterisk/utils.h" /* for ast_flags */
+
+struct ssl_st; /* forward declaration */
+struct ssl_ctx_st; /* forward declaration */
+struct timeval; /* forward declaration */
+typedef struct ssl_st SSL;
+typedef struct ssl_ctx_st SSL_CTX;
#if defined(HAVE_OPENSSL) && (defined(HAVE_FUNOPEN) || defined(HAVE_FOPENCOOKIE))
#define DO_SSL /* comment in/out if you want to support ssl */
#endif
-
-#ifdef DO_SSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-#else
-/* declare dummy types so we can define a pointer to them */
-typedef struct {} SSL;
-typedef struct {} SSL_CTX;
-#endif /* DO_SSL */
/*! SSL support */
#define AST_CERTFILE "asterisk.pem"
diff --git a/main/tcptls.c b/main/tcptls.c
index 23a6a2e..f8f36c5 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -25,33 +25,52 @@
* \author Brett Bryant <brettbryant at gmail.com>
*/
-/*** MODULEINFO
- <use type="external">openssl</use>
- <support_level>core</support_level>
- ***/
-
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk/tcptls.h" /* for ast_tls_config, ast_tcptls_se... */
+
#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include <fcntl.h> /* for O_NONBLOCK */
+#endif /* HAVE_FCNTL_H */
+#include <netinet/in.h> /* for IPPROTO_TCP */
+#ifdef DO_SSL
+#include <openssl/asn1.h> /* for ASN1_STRING_to_UTF8 */
+#include <openssl/crypto.h> /* for OPENSSL_free */
+#include <openssl/err.h> /* for ERR_error_string */
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_SSL3_METHOD, OPENS... */
+#include <openssl/opensslv.h> /* for OPENSSL_VERSION_NUMBER */
+#include <openssl/safestack.h> /* for STACK_OF */
+#include <openssl/ssl.h> /* for SSL_CTX_free, SSL_get_error, ... */
+#include <openssl/x509.h> /* for X509_free, X509_NAME_ENTRY_ge... */
+#include <openssl/x509v3.h> /* for GENERAL_NAME, sk_GENERAL_NAME... */
+#ifndef OPENSSL_NO_DH
+#include <openssl/bio.h> /* for BIO_free, BIO_new_file */
+#include <openssl/dh.h> /* for DH_free */
+#include <openssl/pem.h> /* for PEM_read_bio_DHparams */
+#endif /* OPENSSL_NO_DH */
+#ifndef OPENSSL_NO_EC
+#include <openssl/ec.h> /* for EC_KEY_free, EC_KEY_new_by_cu... */
+#endif /* OPENSSL_NO_EC */
+#endif /* DO_SSL */
+#include <pthread.h> /* for pthread_cancel, pthread_join */
+#include <signal.h> /* for pthread_kill, SIGURG */
+#include <sys/socket.h> /* for setsockopt, shutdown, socket */
+#include <sys/stat.h> /* for stat */
+#include <sys/time.h> /* for timeval */
-#include <signal.h>
-#include <sys/signal.h>
-#include <sys/stat.h>
-
-#include "asterisk/compat.h"
-#include "asterisk/tcptls.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"
+#include "asterisk/app.h" /* for ast_read_textfile */
+#include "asterisk/astobj2.h" /* for ao2_ref, ao2_t_ref, ao2_alloc */
+#include "asterisk/compat.h" /* for strcasecmp */
+#include "asterisk/config.h" /* for ast_parse_arg, ast_parse_flag... */
+#include "asterisk/lock.h" /* for AST_PTHREADT_NULL */
+#include "asterisk/logger.h" /* for ast_log, LOG_ERROR, ast_debug */
+#include "asterisk/netsock2.h" /* for ast_sockaddr_copy, ast_sockad... */
+#include "asterisk/pbx.h" /* for ast_thread_inhibit_escalations */
+#include "asterisk/threadstorage.h" /* for ast_threadstorage_get, AST_TH... */
+#include "asterisk/time.h" /* for ast_remaining_ms, ast_tvnow */
+#include "asterisk/utils.h" /* for ast_true, ast_free, ast_wait_... */
/*! ao2 object used for the FILE stream fopencookie()/funopen() cookie. */
struct ast_tcptls_stream {
--
To view, visit https://gerrit.asterisk.org/9059
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d102728e30336d6522e5e4ae9e964013a0835f7
Gerrit-Change-Number: 9059
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180605/534c3331/attachment-0001.html>
More information about the asterisk-code-review
mailing list