mirror of
https://github.com/curl/curl.git
synced 2026-08-25 23:23:31 +03:00
parent
7a1e99eefa
commit
0476e4fc65
149 changed files with 1381 additions and 1376 deletions
|
|
@ -54,31 +54,31 @@
|
|||
#ifdef USE_APPLE_SECTRUST
|
||||
#define SSL_SYSTEM_VERIFIER
|
||||
|
||||
#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
|
||||
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) \
|
||||
|| (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \
|
||||
&& __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
|
||||
#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && \
|
||||
MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || \
|
||||
(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \
|
||||
__IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
|
||||
#define SUPPORTS_SecTrustEvaluateWithError 1
|
||||
#endif
|
||||
|
||||
#if defined(SUPPORTS_SecTrustEvaluateWithError) \
|
||||
&& ((defined(MAC_OS_X_VERSION_MIN_REQUIRED) \
|
||||
&& MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) \
|
||||
|| (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) \
|
||||
&& __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000))
|
||||
#if defined(SUPPORTS_SecTrustEvaluateWithError) && \
|
||||
((defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
|
||||
MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || \
|
||||
(defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && \
|
||||
__IPHONE_OS_VERSION_MIN_REQUIRED >= 120000))
|
||||
#define REQUIRES_SecTrustEvaluateWithError 1
|
||||
#endif
|
||||
|
||||
#if defined(SUPPORTS_SecTrustEvaluateWithError) \
|
||||
&& !defined(HAVE_BUILTIN_AVAILABLE) \
|
||||
&& !defined(REQUIRES_SecTrustEvaluateWithError)
|
||||
#if defined(SUPPORTS_SecTrustEvaluateWithError) && \
|
||||
!defined(HAVE_BUILTIN_AVAILABLE) && \
|
||||
!defined(REQUIRES_SecTrustEvaluateWithError)
|
||||
#undef SUPPORTS_SecTrustEvaluateWithError
|
||||
#endif
|
||||
|
||||
#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
|
||||
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 100900) \
|
||||
|| (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \
|
||||
&& __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000)
|
||||
#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && \
|
||||
MAC_OS_X_VERSION_MAX_ALLOWED >= 100900) || \
|
||||
(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \
|
||||
__IPHONE_OS_VERSION_MAX_ALLOWED >= 70000)
|
||||
#define SUPPORTS_SecOCSP 1
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ struct cs_entry {
|
|||
};
|
||||
|
||||
/* !checksrc! disable COMMANOSPACE all */
|
||||
static const struct cs_entry cs_list [] = {
|
||||
static const struct cs_entry cs_list[] = {
|
||||
/* TLS 1.3 ciphers */
|
||||
#if defined(USE_MBEDTLS) || defined(USE_RUSTLS)
|
||||
CS_ENTRY(0x1301, TLS,AES,128,GCM,SHA256,,,),
|
||||
|
|
@ -549,7 +549,7 @@ static const struct cs_entry cs_list [] = {
|
|||
|
||||
static int cs_str_to_zip(const char *cs_str, size_t cs_len, uint8_t zip[6])
|
||||
{
|
||||
uint8_t indexes[8] = {0};
|
||||
uint8_t indexes[8] = { 0 };
|
||||
const char *entry, *cur;
|
||||
const char *nxt = cs_str;
|
||||
const char *end = cs_str + cs_len;
|
||||
|
|
@ -597,7 +597,7 @@ static int cs_str_to_zip(const char *cs_str, size_t cs_len, uint8_t zip[6])
|
|||
|
||||
static int cs_zip_to_str(const uint8_t zip[6], char *buf, size_t buf_size)
|
||||
{
|
||||
uint8_t indexes[8] = {0};
|
||||
uint8_t indexes[8] = { 0 };
|
||||
const char *entry;
|
||||
char separator = '-';
|
||||
int idx, i, r;
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@
|
|||
#define BACKEND ((struct schannel_ssl_backend_data *)connssl->backend)
|
||||
|
||||
#define MAX_CAFILE_SIZE 1048576 /* 1 MiB */
|
||||
#define BEGIN_CERT "-----BEGIN CERTIFICATE-----"
|
||||
#define END_CERT "\n-----END CERTIFICATE-----"
|
||||
#define BEGIN_CERT "-----BEGIN CERTIFICATE-----"
|
||||
#define END_CERT "\n-----END CERTIFICATE-----"
|
||||
|
||||
struct cert_chain_engine_config_win8 {
|
||||
DWORD cbSize;
|
||||
|
|
@ -532,7 +532,7 @@ CURLcode Curl_verify_host(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|||
DWORD actual_len = 0;
|
||||
PCERT_ALT_NAME_INFO alt_name_info = NULL;
|
||||
DWORD alt_name_info_size = 0;
|
||||
struct num_ip_data ip_blob = {0};
|
||||
struct num_ip_data ip_blob = { 0 };
|
||||
bool Win8_compat;
|
||||
struct num_ip_data *p = &ip_blob;
|
||||
DWORD i;
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ static const struct Curl_OID OIDtable[] = {
|
|||
{ "2.16.840.1.101.3.4.2.2", "sha384" },
|
||||
{ "2.16.840.1.101.3.4.2.3", "sha512" },
|
||||
{ "1.2.840.113549.1.9.2", "unstructuredName" },
|
||||
{ (const char *) NULL, (const char *) NULL }
|
||||
{ (const char *)NULL, (const char *)NULL }
|
||||
};
|
||||
|
||||
#endif /* WANT_EXTRACT_CERTINFO */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue