mirror of
https://github.com/curl/curl.git
synced 2026-08-26 17:53:33 +03:00
or higher -> or greater 9 src
This commit is contained in:
parent
251780043c
commit
46d858bc3b
3 changed files with 6 additions and 6 deletions
|
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
#include <mbedtls/version.h>
|
#include <mbedtls/version.h>
|
||||||
#if MBEDTLS_VERSION_NUMBER < 0x03020000
|
#if MBEDTLS_VERSION_NUMBER < 0x03020000
|
||||||
#error "mbedTLS 3.2.0 or higher required"
|
#error "mbedTLS 3.2.0 or greater required"
|
||||||
#endif
|
#endif
|
||||||
#include <psa/crypto_config.h>
|
#include <psa/crypto_config.h>
|
||||||
#include <mbedtls/net_sockets.h>
|
#include <mbedtls/net_sockets.h>
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@
|
||||||
/* ALPN requires version 8.1 of the Windows SDK, which was
|
/* ALPN requires version 8.1 of the Windows SDK, which was
|
||||||
shipped with Visual Studio 2013, aka _MSC_VER 1800:
|
shipped with Visual Studio 2013, aka _MSC_VER 1800:
|
||||||
https://learn.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831771
|
https://learn.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831771
|
||||||
Or mingw-w64 9.0 or higher.
|
Or mingw-w64 9.0 or greater.
|
||||||
*/
|
*/
|
||||||
#if (defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR >= 9) || \
|
#if (defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR >= 9) || \
|
||||||
(defined(_MSC_VER) && (_MSC_VER >= 1800) && !defined(_USING_V110_SDK71_))
|
(defined(_MSC_VER) && (_MSC_VER >= 1800) && !defined(_USING_V110_SDK71_))
|
||||||
|
|
@ -1513,7 +1513,7 @@ static void traverse_cert_store(const CERT_CONTEXT *context,
|
||||||
(current_context = CertEnumCertificatesInStore(
|
(current_context = CertEnumCertificatesInStore(
|
||||||
context->hCertStore,
|
context->hCertStore,
|
||||||
current_context)) != NULL) {
|
current_context)) != NULL) {
|
||||||
/* Windows 11 22H2 OS Build 22621.674 or higher enumerates certificates in
|
/* Windows 11 22H2 OS Build 22621.674 or greater enumerates certificates in
|
||||||
leaf-to-root order while all previous versions of Windows enumerate
|
leaf-to-root order while all previous versions of Windows enumerate
|
||||||
certificates in root-to-leaf order. Determine the order of enumeration
|
certificates in root-to-leaf order. Determine the order of enumeration
|
||||||
by comparing SECPKG_ATTR_REMOTE_CERT_CONTEXT's pbCertContext with the
|
by comparing SECPKG_ATTR_REMOTE_CERT_CONTEXT's pbCertContext with the
|
||||||
|
|
@ -2610,7 +2610,7 @@ static int schannel_init(void)
|
||||||
if(p_wine_get_version) { /* WINE detected */
|
if(p_wine_get_version) { /* WINE detected */
|
||||||
curl_off_t ver = 0;
|
curl_off_t ver = 0;
|
||||||
const char *wine_version = p_wine_get_version(); /* e.g. "6.0.2" */
|
const char *wine_version = p_wine_get_version(); /* e.g. "6.0.2" */
|
||||||
/* Assume ALPN support with WINE 6.0 or higher */
|
/* Assume ALPN support with WINE 6.0 or greater */
|
||||||
if(wine_version)
|
if(wine_version)
|
||||||
curlx_str_number(&wine_version, &ver, 20);
|
curlx_str_number(&wine_version, &ver, 20);
|
||||||
s_win_has_alpn = (ver >= 6);
|
s_win_has_alpn = (ver >= 6);
|
||||||
|
|
|
||||||
|
|
@ -34,10 +34,10 @@
|
||||||
#include <wolfssl/version.h>
|
#include <wolfssl/version.h>
|
||||||
|
|
||||||
#if LIBWOLFSSL_VERSION_HEX < 0x05000000 /* wolfSSL 5.0.0 (2021-11-01) */
|
#if LIBWOLFSSL_VERSION_HEX < 0x05000000 /* wolfSSL 5.0.0 (2021-11-01) */
|
||||||
#error "wolfSSL version should be 5.0.0 or higher"
|
#error "wolfSSL version should be 5.0.0 or greater"
|
||||||
#endif
|
#endif
|
||||||
#if defined(OPENSSL_COEXIST) && LIBWOLFSSL_VERSION_HEX < 0x05007006
|
#if defined(OPENSSL_COEXIST) && LIBWOLFSSL_VERSION_HEX < 0x05007006
|
||||||
#error "wolfSSL 5.7.6 or higher is required to coexist with OpenSSL"
|
#error "wolfSSL 5.7.6 or greater is required to coexist with OpenSSL"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* To determine what functions are available we rely on one or both of:
|
/* To determine what functions are available we rely on one or both of:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue