From 897ef0771255f7c0044f8860b05fa972b220b575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Wed, 12 Nov 2014 15:38:21 +0100 Subject: [PATCH] Fix error handling for CRL loading in OpenSSL code --- src/ChangeLog | 4 ++++ src/openssl.c | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 435026e3..32eebda4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-12 Tim Ruehsen + + * openssl.c (ssl_init): Fix error handling for CRL loading + 2014-11-12 Witchakorn Kamolpornwijit (tiny change) * html-parse.c (map_html_tags): Fix range check diff --git a/src/openssl.c b/src/openssl.c index 371913cb..ae06edcd 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -258,14 +258,10 @@ ssl_init (void) { X509_STORE *store = SSL_CTX_get_cert_store (ssl_ctx); X509_LOOKUP *lookup; - int rc; if (!(lookup = X509_STORE_add_lookup (store, X509_LOOKUP_file ())) - || (!(rc = X509_load_crl_file (lookup, opt.crl_file, X509_FILETYPE_PEM)))) - { - logprintf (LOG_NOTQUIET, _("ERROR: Failed to load CRL file '%s': (%d)\n"), opt.crl_file, rc); - return false; - } + || (!X509_load_crl_file (lookup, opt.crl_file, X509_FILETYPE_PEM))) + goto error; X509_STORE_set_flags (store, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL); }