diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 51 | ||||
| -rw-r--r-- | src/core/network-openssl.c | 10 | ||||
| -rw-r--r-- | src/core/servers.c | 4 |
4 files changed, 7 insertions, 59 deletions
@@ -17,6 +17,7 @@ v0.8.21-head 2016-xx-xx The Irssi team <staff@irssi.org> + autolog_ignore_targets and activity_hide_targets learn a new syntax tag/* and * to ignore whole networks or everything. + /hilight got a -matchcase flag to hilight case sensitively (#421). + + Always build irssi with TLS support. - IP addresses are no longer stored when resolve_reverse_lookup is used. - /names and $[...] now uses utf8 string operations (#40, #411). diff --git a/configure.ac b/configure.ac index ee03eb82..629dd590 100644 --- a/configure.ac +++ b/configure.ac @@ -154,14 +154,6 @@ AC_ARG_ENABLE(true-color, want_truecolor=no) dnl ** -dnl ** SSL Library checks (OpenSSL) -dnl ** - -AC_ARG_ENABLE(ssl, -[ --disable-ssl Disable Secure Sockets Layer support],, - enable_ssl=yes) - -dnl ** dnl ** just some generic stuff... dnl ** @@ -239,6 +231,11 @@ if test "x$want_socks" = "xyes"; then fi dnl ** +dnl ** OpenSSL checks +dnl ** +AC_CHECK_LIB([ssl], [SSL_library_init]) + +dnl ** dnl ** fe-text checks dnl ** @@ -279,27 +276,7 @@ if test -z "$GLIB_LIBS"; then AC_ERROR([GLIB is required to build irssi.]) fi -LIBS="$LIBS $GLIB_LIBS" - -have_openssl=no -if test "$enable_ssl" = "yes"; then - PKG_CHECK_MODULES(SSL, openssl, :, :) - if test "$SSL_LIBS"; then - CFLAGS="$CFLAGS $SSL_CFLAGS" - have_openssl=yes - else - AC_CHECK_LIB(ssl, SSL_read, [ - AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [ - SSL_LIBS="-lssl -lcrypto" - have_openssl=yes - ]) - ],, -lcrypto) - fi - if test "$have_openssl" = "yes"; then - AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support) - LIBS="$LIBS $SSL_LIBS" - fi -fi +LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto" dnl ** dnl ** curses checks @@ -569,12 +546,6 @@ if test "x$want_dane" = "xyes"; then AC_DEFINE([HAVE_DANE], [], [DANE support]) have_dane=yes ], [], [-lssl -lcrypto -lsres -lpthread]) - - if test x$have_dane = "xyes" ; then - if test x$have_openssl = "xno" ; then - AC_ERROR([SSL is required to build Irssi with DANE support enabled.]) - fi - fi fi if test "x$want_truecolor" = "xyes"; then @@ -695,16 +666,6 @@ echo "Install prefix ................... : $prefix" echo -echo "Building with SSL support ........ : $have_openssl" -if test "x$have_openssl" = "xno" -a "x$enable_ssl" = "xyes"; then - if test -f /etc/debian_version; then - echo " - Try: sudo apt-get install libssl-dev" - elif test -f /etc/redhat-release; then - echo " - Try installing openssl-devel" - else - echo " - Try installing OpenSSL development headers" - fi -fi echo "Building with 64bit DCC support .. : $offt_64bit" echo "Building with DANE support ....... : $have_dane" echo "Building with true color support.. : $want_truecolor" diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index a18e6fc7..014f0a28 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -23,8 +23,6 @@ #include "misc.h" #include "servers.h" -#ifdef HAVE_OPENSSL - #include <openssl/crypto.h> #include <openssl/x509.h> #include <openssl/x509v3.h> @@ -620,13 +618,5 @@ int irssi_ssl_handshake(GIOChannel *handle) return ret ? 0 : -1; } -#else /* HAVE_OPENSSL */ -GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server) -{ - g_warning("Connection failed: SSL support not enabled in this build."); - errno = ENOSYS; - return NULL; -} -#endif /* ! HAVE_OPENSSL */ diff --git a/src/core/servers.c b/src/core/servers.c index d6297c4d..dfcbcde0 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -167,7 +167,6 @@ static void server_connect_callback_init(SERVER_REC *server, GIOChannel *handle) server_connect_finished(server); } -#ifdef HAVE_OPENSSL static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *handle) { int error; @@ -198,7 +197,6 @@ static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *han server_connect_finished(server); } -#endif static void server_real_connect(SERVER_REC *server, IPADDR *ip, const char *unix_socket) @@ -247,11 +245,9 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip, g_free(errmsg2); } else { server->handle = net_sendbuffer_create(handle, 0); -#ifdef HAVE_OPENSSL if (server->connrec->use_ssl) server_connect_callback_init_ssl(server, handle); else -#endif server->connect_tag = g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ, (GInputFunction) |