diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-09-10 19:43:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 19:43:59 +0200 |
| commit | 24ad80177b10093544ec07a5d6b3ed4b1bfc6fb8 (patch) | |
| tree | da69ca9de40e7cc067f9ff372687d3d59ab22601 /src/core/network-openssl.c | |
| parent | be70fa5eb750ed337a55463c68d5a51b47d1efcd (diff) | |
| parent | b529e1a9df134bbc5618752abcf19af0110b6868 (diff) | |
| download | irssi-24ad80177b10093544ec07a5d6b3ed4b1bfc6fb8.zip | |
Merge pull request #735 from trasz/capsicum
Add Capsicum support
Diffstat (limited to 'src/core/network-openssl.c')
| -rw-r--r-- | src/core/network-openssl.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 4de3cb3c..2054f28a 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -20,6 +20,7 @@ #include "module.h" #include "network.h" +#include "network-openssl.h" #include "net-sendbuffer.h" #include "misc.h" #include "servers.h" @@ -58,6 +59,7 @@ typedef struct } GIOSSLChannel; static int ssl_inited = FALSE; +static X509_STORE *store = NULL; static void irssi_ssl_free(GIOChannel *handle) { @@ -362,8 +364,10 @@ static GIOFuncs irssi_ssl_channel_funcs = { irssi_ssl_get_flags }; -static gboolean irssi_ssl_init(void) +gboolean irssi_ssl_init(void) { + int success; + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) if (!OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, NULL)) { g_error("Could not initialize OpenSSL"); @@ -374,6 +378,20 @@ static gboolean irssi_ssl_init(void) SSL_load_error_strings(); OpenSSL_add_all_algorithms(); #endif + store = X509_STORE_new(); + if (store == NULL) { + g_error("Could not initialize OpenSSL: X509_STORE_new() failed"); + return FALSE; + } + + success = X509_STORE_set_default_paths(store); + if (success == 0) { + g_warning("Could not load default certificates"); + X509_STORE_free(store); + store = NULL; + /* Don't return an error; the user might have their own cafile/capath. */ + } + ssl_inited = TRUE; return TRUE; @@ -491,9 +509,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_ g_free(scafile); g_free(scapath); verify = TRUE; - } else { - if (!SSL_CTX_set_default_verify_paths(ctx)) - g_warning("Could not load default certificates"); + } else if (store != NULL) { + SSL_CTX_set_cert_store(ctx, store); } if(!(ssl = SSL_new(ctx))) |