diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2016-10-16 13:13:02 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@0x90.dk> | 2016-10-16 14:55:48 +0200 |
| commit | 6300dfec71d376c96351708f76a6c4ee4a187eb5 (patch) | |
| tree | c7b084a7df1d1b6fe5bcc5ef8ecd5d8df8bafc9d /src/core | |
| parent | fb78787d4e2098612979b45df3237b67effbbc3a (diff) | |
| download | irssi-6300dfec71d376c96351708f76a6c4ee4a187eb5.zip | |
Always build irssi with TLS support.
This patch removes the optional checks for whether to build irssi with
TLS support or not. This will allow us to ship a default configuration
file where we connect to TLS enabled IRC servers out of the box.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/network-openssl.c | 10 | ||||
| -rw-r--r-- | src/core/servers.c | 4 |
2 files changed, 0 insertions, 14 deletions
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) |