diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2017-08-10 14:35:34 +0100 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2017-08-10 14:35:34 +0100 |
| commit | edee0ba587069a860eac43f9219f8ecfa49fe1fa (patch) | |
| tree | 2b2730d5b23dc3b1ec1c4c265b366b940ab22892 /src/core | |
| parent | 0c49a84ffb8d74506a13653183bfa1ef8ffd2554 (diff) | |
| download | irssi-edee0ba587069a860eac43f9219f8ecfa49fe1fa.zip | |
Don't error out on failure to load default certificate store.
This restores the previous behaviour.
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/network-openssl.c | 6 |
1 files 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); } |