From 2d7d7907a2d79c1b645f13390454057eeae23d1b Mon Sep 17 00:00:00 2001 From: sxjkl <390530071@qq.com> Date: Wed, 10 Sep 2025 08:49:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=BB=84=E8=93=9D=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/vtls/openssl.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index c521511a0..8d07953f7 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -30,6 +30,18 @@ #include "curl_setup.h" #include "openhitls.h" +#if defined(USE_OPENHITLS) +#define CHECK_VERSION_CALL(f) \ +do { \ + if (data->set.ssl.primary.version >= CURL_SSLVERSION_TLCPv1_1 && data->set.ssl.primary.version < CURL_SSLVERSION_LAST) { \ + printf("%s:%d OPENHITLS CALL\n", __func__, __LINE__); \ + return Curl_ssl_hitls.f; \ + } \ +} while(0) +#else +#define CHECK_VERSION_CALL(f) +#endif + #if defined(USE_QUICHE) || defined(USE_OPENSSL) #include @@ -5082,11 +5094,7 @@ static ssize_t ossl_recv(struct Curl_cfilter *cf, size_t buffersize, /* max amount to read */ CURLcode *curlcode) { -#if defined(USE_OPENHITLS) - if (data->set.ssl.primary.version == CURL_SSLVERSION_TLCPv1_1) { - return Curl_ssl_hitls.recv_plain(cf, data, buf, buffersize, curlcode); - } -#endif + CHECK_VERSION_CALL(recv_plain(cf, data, buf, buffersize, curlcode)); char error_buffer[256]; unsigned long sslerror; ssize_t nread; -- Gitee From 77f7676d649a28d70eaf0e5002bd2ebdf15f4742 Mon Sep 17 00:00:00 2001 From: panjie Date: Wed, 10 Sep 2025 13:50:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E9=BB=84=E8=93=9D=E5=90=8C?= =?UTF-8?q?=E6=AD=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2d7d7907a2d79c1b645f13390454057eeae23d1b. --- lib/vtls/openssl.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 8d07953f7..c521511a0 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -30,18 +30,6 @@ #include "curl_setup.h" #include "openhitls.h" -#if defined(USE_OPENHITLS) -#define CHECK_VERSION_CALL(f) \ -do { \ - if (data->set.ssl.primary.version >= CURL_SSLVERSION_TLCPv1_1 && data->set.ssl.primary.version < CURL_SSLVERSION_LAST) { \ - printf("%s:%d OPENHITLS CALL\n", __func__, __LINE__); \ - return Curl_ssl_hitls.f; \ - } \ -} while(0) -#else -#define CHECK_VERSION_CALL(f) -#endif - #if defined(USE_QUICHE) || defined(USE_OPENSSL) #include @@ -5094,7 +5082,11 @@ static ssize_t ossl_recv(struct Curl_cfilter *cf, size_t buffersize, /* max amount to read */ CURLcode *curlcode) { - CHECK_VERSION_CALL(recv_plain(cf, data, buf, buffersize, curlcode)); +#if defined(USE_OPENHITLS) + if (data->set.ssl.primary.version == CURL_SSLVERSION_TLCPv1_1) { + return Curl_ssl_hitls.recv_plain(cf, data, buf, buffersize, curlcode); + } +#endif char error_buffer[256]; unsigned long sslerror; ssize_t nread; -- Gitee From 561409bc245447c89ece7eaa0ec6a441946af2b1 Mon Sep 17 00:00:00 2001 From: panjie Date: Wed, 10 Sep 2025 14:24:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BB=84=E8=93=9D=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: panjie --- lib/vtls/openssl.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index c521511a0..8d07953f7 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -30,6 +30,18 @@ #include "curl_setup.h" #include "openhitls.h" +#if defined(USE_OPENHITLS) +#define CHECK_VERSION_CALL(f) \ +do { \ + if (data->set.ssl.primary.version >= CURL_SSLVERSION_TLCPv1_1 && data->set.ssl.primary.version < CURL_SSLVERSION_LAST) { \ + printf("%s:%d OPENHITLS CALL\n", __func__, __LINE__); \ + return Curl_ssl_hitls.f; \ + } \ +} while(0) +#else +#define CHECK_VERSION_CALL(f) +#endif + #if defined(USE_QUICHE) || defined(USE_OPENSSL) #include @@ -5082,11 +5094,7 @@ static ssize_t ossl_recv(struct Curl_cfilter *cf, size_t buffersize, /* max amount to read */ CURLcode *curlcode) { -#if defined(USE_OPENHITLS) - if (data->set.ssl.primary.version == CURL_SSLVERSION_TLCPv1_1) { - return Curl_ssl_hitls.recv_plain(cf, data, buf, buffersize, curlcode); - } -#endif + CHECK_VERSION_CALL(recv_plain(cf, data, buf, buffersize, curlcode)); char error_buffer[256]; unsigned long sslerror; ssize_t nread; -- Gitee