From 5c8cda3a8089ff340224e6ab147d4bbe18dca0e2 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Thu, 17 May 2012 20:07:04 -0400 Subject: CRL addition returns count of CRLs added A couple more cert1/2 strings updated, plus some disambiguating rhubarb. --- src/src/tls-gnu.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c index 1953be1e4..a9a82e88f 100644 --- a/src/src/tls-gnu.c +++ b/src/src/tls-gnu.c @@ -728,15 +728,18 @@ if (cert_count < 0) } DEBUG(D_tls) debug_printf("Added %d certificate authorities.\n", cert_count); -if (state->tls_crl && *state->tls_crl) +if (state->tls_crl && *state->tls_crl && + state->exp_tls_crl && *state->exp_tls_crl) { - if (state->exp_tls_crl && *state->exp_tls_crl) + DEBUG(D_tls) debug_printf("loading CRL file = %s\n", state->exp_tls_crl); + cert_count = gnutls_certificate_set_x509_crl_file(state->x509_cred, + CS state->exp_tls_crl, GNUTLS_X509_FMT_PEM); + if (cert_count < 0) { - DEBUG(D_tls) debug_printf("loading CRL file = %s\n", state->exp_tls_crl); - rc = gnutls_certificate_set_x509_crl_file(state->x509_cred, - CS state->exp_tls_crl, GNUTLS_X509_FMT_PEM); + rc = cert_count; exim_gnutls_err_check(US"gnutls_certificate_set_x509_crl_file"); } + DEBUG(D_tls) debug_printf("Processed %d CRLs.\n", cert_count); } return OK; -- cgit v1.2.3