romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 13:03:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Viktor Szakats 2026-03-09 00:07:49 +01:00
parent 2f6eec2c77
commit a0f358bd7f
No known key found for this signature in database
28 changed files with 77 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/vtls/openssl.c
View file

@ -384,7 +384,7 @@ static CURLcode ossl_certchain(struct Curl_easy *data, SSL *ssl)
numcerts = sk_X509_num(sk);
if(numcerts > MAX_ALLOWED_CERT_AMOUNT) {
failf(data, "%d certificates is more than allowed (%u)", (int)numcerts,
failf(data, "%d certificates is more than allowed (%d)", (int)numcerts,
MAX_ALLOWED_CERT_AMOUNT);
return CURLE_SSL_CONNECT_ERROR;
}
@ -2065,7 +2065,7 @@ static CURLcode ossl_verifyhost(struct Curl_easy *data,
break;
default:
DEBUGASSERT(0);
failf(data, "unexpected ssl peer type: %d", peer->type);
failf(data, "unexpected ssl peer type: %u", peer->type);
return CURLE_PEER_FAILED_VERIFICATION;
}
@ -2492,7 +2492,7 @@ static void ossl_trace(int direction, int ssl_ver, int content_type,
verstr = "TLSv1.3";
break;
default:
curl_msnprintf(unknown, sizeof(unknown), "(%x)", ssl_ver);
curl_msnprintf(unknown, sizeof(unknown), "(%x)", (unsigned int)ssl_ver);
verstr = unknown;
break;
}
@ -3371,7 +3371,7 @@ ossl_init_session_and_alpns(struct ossl_ctx *octx,
scs->alpn ? scs->alpn : "-");
octx->reused_session = TRUE;
infof(data, "SSL verify result: %lx",
SSL_get_verify_result(octx->ssl));
(unsigned long)SSL_get_verify_result(octx->ssl));
#ifdef HAVE_OPENSSL_EARLYDATA
if(ssl_config->earlydata && scs->alpn &&
SSL_SESSION_get_max_early_data(ssl_session) &&
@ -4768,7 +4768,7 @@ CURLcode Curl_ossl_check_peer_cert(struct Curl_cfilter *cf,
ossl_verify = SSL_get_verify_result(octx->ssl);
ssl_config->certverifyresult = ossl_verify;
infof(data, "OpenSSL verify result: %lx", ossl_verify);
infof(data, "OpenSSL verify result: %lx", (unsigned long)ossl_verify);
verified = (ossl_verify == X509_V_OK);
if(verified)

2
lib/vtls/vtls.c
View file

@ -1393,7 +1393,7 @@ static CURLcode ssl_cf_set_earlydata(struct Curl_cfilter *cf,
if(blen > connssl->earlydata_max)
blen = connssl->earlydata_max;
result = Curl_bufq_write(&connssl->earlydata, buf, blen, &nwritten);
CURL_TRC_CF(data, cf, "ssl_cf_set_earlydata(len=%zu) -> %zd",
CURL_TRC_CF(data, cf, "ssl_cf_set_earlydata(len=%zu) -> %zu",
blen, nwritten);
if(result)
return result;

8
lib/vtls/vtls_scache.c
View file

@ -200,7 +200,7 @@ CURLcode Curl_ssl_peer_key_make(struct Curl_cfilter *cf,
}
if(ssl->version || ssl->version_max) {
r = curlx_dyn_addf(&buf, ":TLSVER-%d-%d", ssl->version,
r = curlx_dyn_addf(&buf, ":TLSVER-%d-%u", ssl->version,
(ssl->version_max >> 16));
if(r)
goto out;
@ -832,8 +832,8 @@ out:
else
CURL_TRC_SSLS(data, "added session for %s [proto=0x%x, "
"valid_secs=%" FMT_OFF_T ", alpn=%s, earlydata=%zu, "
"quic_tp=%s], peer has %zu sessions now",
ssl_peer_key, s->ietf_tls_id, s->valid_until - now,
"quic_tp=%s], peer has %zu sessions now", ssl_peer_key,
(unsigned int)s->ietf_tls_id, s->valid_until - now,
s->alpn, s->earlydata_max, s->quic_tp ? "yes" : "no",
peer ? Curl_llist_count(&peer->sessions) : 0);
return result;
@ -905,7 +905,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf,
*ps = s;
CURL_TRC_SSLS(data, "took session for %s [proto=0x%x, "
"alpn=%s, earlydata=%zu, quic_tp=%s], %zu sessions remain",
ssl_peer_key, s->ietf_tls_id, s->alpn,
ssl_peer_key, (unsigned int)s->ietf_tls_id, s->alpn,
s->earlydata_max, s->quic_tp ? "yes" : "no",
Curl_llist_count(&peer->sessions));
}