OpenSSL: Merge error returns

These similar error cases can use a single return statement.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 7f9c8375726dfe4970f528b490754dfd1a818ebd..17a63cffad8b5e31d796e8afd1511f967b4f3877 100644 (file)
--- 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;
        }