From f24b97972bea5a7b5b1c158923cc85250313b1dd Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 30 Jun 2015 21:48:22 +0300 Subject: [PATCH] OpenSSL: Merge error returns These similar error cases can use a single return statement. Signed-off-by: Jouni Malinen --- src/crypto/tls_openssl.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 7f9c83757..17a63cffa 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -3585,19 +3585,12 @@ int tls_global_set_params(void *tls_ctx, __func__, ERR_error_string(err, NULL)); } - if (tls_global_ca_cert(ssl_ctx, params->ca_cert)) - return -1; - - if (tls_global_client_cert(ssl_ctx, params->client_cert)) - return -1; - - if (tls_global_private_key(ssl_ctx, params->private_key, - params->private_key_passwd)) - return -1; - - if (tls_global_dh(ssl_ctx, params->dh_file)) { - wpa_printf(MSG_INFO, "TLS: Failed to load DH file '%s'", - params->dh_file); + if (tls_global_ca_cert(ssl_ctx, params->ca_cert) || + tls_global_client_cert(ssl_ctx, params->client_cert) || + tls_global_private_key(ssl_ctx, params->private_key, + params->private_key_passwd) || + tls_global_dh(ssl_ctx, params->dh_file)) { + wpa_printf(MSG_INFO, "TLS: Failed to set global parameters"); return -1; }