From edee0ba587069a860eac43f9219f8ecfa49fe1fa Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Thu, 10 Aug 2017 14:35:34 +0100 Subject: Don't error out on failure to load default certificate store. This restores the previous behaviour. Signed-off-by: Edward Tomasz Napierala --- src/core/network-openssl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 78bdcce4..2054f28a 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -386,10 +386,10 @@ gboolean irssi_ssl_init(void) success = X509_STORE_set_default_paths(store); if (success == 0) { - g_error("Could not load default certificates"); + g_warning("Could not load default certificates"); X509_STORE_free(store); store = NULL; - return FALSE; + /* Don't return an error; the user might have their own cafile/capath. */ } ssl_inited = TRUE; @@ -509,7 +509,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_ g_free(scafile); g_free(scapath); verify = TRUE; - } else { + } else if (store != NULL) { SSL_CTX_set_cert_store(ctx, store); } -- cgit v1.2.3