From 645b72be064f9c5588a5ac3f84fe4f9df82308eb Mon Sep 17 00:00:00 2001 From: Tim Kourt Date: Tue, 4 Dec 2018 16:31:04 -0800 Subject: [PATCH] eap-tls-common: Validate successful loading of keys/certs --- src/eap-tls-common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/eap-tls-common.c b/src/eap-tls-common.c index f0a870f3..cbaeca2e 100644 --- a/src/eap-tls-common.c +++ b/src/eap-tls-common.c @@ -507,16 +507,16 @@ static bool eap_tls_tunnel_init(struct eap_state *eap) NULL); if (!l_tls_set_auth_data(eap_tls->tunnel, eap_tls->client_cert, - eap_tls->client_key, - eap_tls->passphrase)) { - l_error("%s: Failed to set authentication data.", + eap_tls->client_key, + eap_tls->passphrase) || + (eap_tls->ca_cert && + !l_tls_set_cacert(eap_tls->tunnel, + eap_tls->ca_cert))) { + l_error("%s: Error loading TLS keys or certificates.", eap_get_method_name(eap)); return false; } - if (eap_tls->ca_cert) - l_tls_set_cacert(eap_tls->tunnel, eap_tls->ca_cert); - return true; }