From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Sun, 16 Feb 2025 20:37:24 +0000 (+0100)
Subject: Revert "openssl: fix out of scope variables in goto"
X-Git-Tag: curl-8_13_0~451
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4afe3e7d8ae11f3bcb69d59f09050ddb625cce5c;p=thirdparty%2Fcurl.git

Revert "openssl: fix out of scope variables in goto"

This reverts the main part of commit
3f79695be9e4628d246740bcd36c627daab676ca, but keeping the
formatting fix.

Closes https://github.com/curl/curl/pull/16356
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 9bc1fde6fe..3e49a95534 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1289,9 +1289,7 @@ int cert_stuff(struct Curl_easy *data,
   if(cert_file || cert_blob || (file_type == SSL_FILETYPE_ENGINE) ||
      (file_type == SSL_FILETYPE_PROVIDER)) {
     SSL *ssl;
-    X509 *x509 = NULL;
-    EVP_PKEY *pri = NULL;
-    STACK_OF(X509) *ca = NULL;
+    X509 *x509;
     int cert_done = 0;
     int cert_use_result;
 
@@ -1480,6 +1478,8 @@ int cert_stuff(struct Curl_easy *data,
     {
       BIO *cert_bio = NULL;
       PKCS12 *p12 = NULL;
+      EVP_PKEY *pri;
+      STACK_OF(X509) *ca = NULL;
       if(cert_blob) {
         cert_bio = BIO_new_mem_buf(cert_blob->data, (int)(cert_blob->len));
         if(!cert_bio) {