luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts the main part of commit
3f79695be9, but keeping the
formatting fix.

Closes https://github.com/curl/curl/pull/16356
This commit is contained in:
Marcel Raad 2025-02-16 21:37:24 +01:00
parent b22f9066a5
commit 4afe3e7d8a
No known key found for this signature in database
GPG Key ID: 33C416EFAE4D6F02
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vtls/openssl.c
View File

@ -1289,9 +1289,7 @@ int cert_stuff(struct Curl_easy *data,
if(cert_file || cert_blob || (file_type == SSL_FILETYPE_ENGINE) || if(cert_file || cert_blob || (file_type == SSL_FILETYPE_ENGINE) ||
(file_type == SSL_FILETYPE_PROVIDER)) { (file_type == SSL_FILETYPE_PROVIDER)) {
SSL *ssl; SSL *ssl;
X509 *x509 = NULL; X509 *x509;
EVP_PKEY *pri = NULL;
STACK_OF(X509) *ca = NULL;
int cert_done = 0; int cert_done = 0;
int cert_use_result; int cert_use_result;
@ -1480,6 +1478,8 @@ int cert_stuff(struct Curl_easy *data,
{ {
BIO *cert_bio = NULL; BIO *cert_bio = NULL;
PKCS12 *p12 = NULL; PKCS12 *p12 = NULL;
EVP_PKEY *pri;
STACK_OF(X509) *ca = NULL;
if(cert_blob) { if(cert_blob) {
cert_bio = BIO_new_mem_buf(cert_blob->data, (int)(cert_blob->len)); cert_bio = BIO_new_mem_buf(cert_blob->data, (int)(cert_blob->len));
if(!cert_bio) { if(!cert_bio) {