698eee1b95
Daniel Stenberg
2026-04-08
Subject
vtls_scache: include cert_blob independently of verifypeer
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/vtls/vtls_scache.c+12 -5
| @@ -238,11 +238,6 @@ CURLcode Curl_ssl_peer_key_make(struct Curl_cfilter *cf, | |
| r = cf_ssl_peer_key_add_path(&buf, "Issuer", ssl->issuercert, &is_local); | |
| if(r) | |
| goto out; | |
| - | if(ssl->cert_blob) { |
| - | r = cf_ssl_peer_key_add_hash(&buf, "CertBlob", ssl->cert_blob); |
| - | if(r) |
| - | goto out; |
| - | } |
| if(ssl->ca_info_blob) { | |
| r = cf_ssl_peer_key_add_hash(&buf, "CAInfoBlob", ssl->ca_info_blob); | |
| if(r) | |
| @@ -254,6 +249,11 @@ CURLcode Curl_ssl_peer_key_make(struct Curl_cfilter *cf, | |
| goto out; | |
| } | |
| } | |
| + | if(ssl->cert_blob) { |
| + | r = cf_ssl_peer_key_add_hash(&buf, "CertBlob", ssl->cert_blob); |
| + | if(r) |
| + | goto out; |
| + | } |
| if(ssl->pinned_key && ssl->pinned_key[0]) { | |
| r = curlx_dyn_addf(&buf, ":Pinned-%s", ssl->pinned_key); | |
| if(r) | |
| @@ -734,12 +734,19 @@ static CURLcode cf_ssl_add_peer(struct Curl_easy *data, | |
| peer = cf_ssl_get_free_peer(scache); | |
| if(peer) { | |
| + | char buffer[64]; |
| const char *ccert = conn_config ? conn_config->clientcert : NULL; | |
| const char *username = NULL, *password = NULL; | |
| #ifdef USE_TLS_SRP | |
| username = conn_config ? conn_config->username : NULL; | |
| password = conn_config ? conn_config->password : NULL; | |
| #endif | |
| + | if(!ccert && conn_config && conn_config->cert_blob) { |
| + | /* when using a client cert blob, create a name for it */ |
| + | curl_msnprintf(buffer, sizeof(buffer), |
| + | "cert-%p", conn_config->cert_blob->data); |
| + | ccert = buffer; /* data is strduped by cf_ssl_scache_peer_init */ |
| + | } |
| result = cf_ssl_scache_peer_init(peer, ssl_peer_key, ccert, | |
| username, password, NULL, NULL); | |
| if(result) | |