From: Richard Levitte <levitte@openssl.org>
Date: Wed, 8 Jan 2025 09:15:02 +0000 (+0100)
Subject: Fix the use of OPENSSL_HTTP_PROXY / OPENSSL_HTTPS_PROXY
X-Git-Tag: openssl-3.1.8~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0cf88a83b9ba29994cc54dffef2493e10cb361;p=thirdparty%2Fopenssl.git

Fix the use of OPENSSL_HTTP_PROXY / OPENSSL_HTTPS_PROXY

Fixes #26337

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26340)

(cherry picked from commit 6a2472fb3e958c029989286d9272bd2b23738f85)
---

diff --git a/crypto/http/http_lib.c b/crypto/http/http_lib.c
index 44c8c0f89e4..04d64246a27 100644
--- a/crypto/http/http_lib.c
+++ b/crypto/http/http_lib.c
@@ -299,7 +299,7 @@ const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
     if (proxy == NULL)
         proxy = ossl_safe_getenv(use_ssl ? "https_proxy" : "http_proxy");
     if (proxy == NULL)
-        proxy = ossl_safe_getenv(use_ssl ? OPENSSL_HTTP_PROXY : OPENSSL_HTTPS_PROXY);
+        proxy = ossl_safe_getenv(use_ssl ? OPENSSL_HTTPS_PROXY : OPENSSL_HTTP_PROXY);
 
     if (proxy == NULL || *proxy == '\0' || !use_proxy(no_proxy, server))
         return NULL;