romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-12 06:37:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

schannel: avoid malloc for CAinfo_blob_digest

Browse source 
...it can just as well be part of the struct always.

Closes #14777
This commit is contained in:
Daniel Stenberg 2024-09-04 10:07:08 +02:00
parent 32eee8f139
commit 3e7ddf94a2
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/vtls/schannel.c
View file

@ -2846,9 +2846,6 @@ HCERTSTORE Curl_schannel_get_cached_cert_store(struct Curl_cfilter *cf,
}
if(ca_info_blob) {
if(!share->CAinfo_blob_digest) {
return NULL;
}
if(share->CAinfo_blob_size != ca_info_blob->len) {
return NULL;
}
@ -2856,10 +2853,9 @@ HCERTSTORE Curl_schannel_get_cached_cert_store(struct Curl_cfilter *cf,
ca_info_blob->len,
info_blob_digest,
CURL_SHA256_DIGEST_LENGTH);
if(memcmp(share->CAinfo_blob_digest,
info_blob_digest,
if(memcmp(share->CAinfo_blob_digest, info_blob_digest,
CURL_SHA256_DIGEST_LENGTH)) {
return NULL;
return NULL;
}
}
else {
@ -2882,7 +2878,6 @@ static void schannel_cert_share_free(void *key, size_t key_len, void *p)
if(share->cert_store) {
CertCloseStore(share->cert_store, 0);
}
free(share->CAinfo_blob_digest);
free(share->CAfile);
free(share);
}
@ -2895,7 +2890,6 @@ bool Curl_schannel_set_cached_cert_store(struct Curl_cfilter *cf,
struct Curl_multi *multi = data->multi;
const struct curl_blob *ca_info_blob = conn_config->ca_info_blob;
struct schannel_cert_share *share;
unsigned char *CAinfo_blob_digest = NULL;
size_t CAinfo_blob_size = 0;
char *CAfile = NULL;
@ -2923,13 +2917,9 @@ bool Curl_schannel_set_cached_cert_store(struct Curl_cfilter *cf,
}
if(ca_info_blob) {
CAinfo_blob_digest = malloc(CURL_SHA256_DIGEST_LENGTH);
if(!CAinfo_blob_digest) {
return false;
}
schannel_sha256sum((const unsigned char *)ca_info_blob->data,
ca_info_blob->len,
CAinfo_blob_digest,
share->CAinfo_blob_digest,
CURL_SHA256_DIGEST_LENGTH);
CAinfo_blob_size = ca_info_blob->len;
}
@ -2946,12 +2936,10 @@ bool Curl_schannel_set_cached_cert_store(struct Curl_cfilter *cf,
if(share->cert_store) {
CertCloseStore(share->cert_store, 0);
}
free(share->CAinfo_blob_digest);
free(share->CAfile);
share->time = Curl_now();
share->cert_store = cert_store;
share->CAinfo_blob_digest = CAinfo_blob_digest;
share->CAinfo_blob_size = CAinfo_blob_size;
share->CAfile = CAfile;
return true;

4
lib/vtls/schannel_int.h
View file

@ -28,6 +28,8 @@
#ifdef USE_SCHANNEL
#include "vtls.h"
#if (defined(__MINGW32__) || defined(CERT_CHAIN_REVOCATION_CHECK_CHAIN)) \
&& !defined(CURL_WINDOWS_APP)
#define HAS_MANUAL_VERIFY_API
@ -165,7 +167,7 @@ struct schannel_ssl_backend_data {
#define MPROTO_SCHANNEL_CERT_SHARE_KEY "tls:schannel:cert:share"
struct schannel_cert_share {
unsigned char *CAinfo_blob_digest; /* CA info blob digest */
unsigned char CAinfo_blob_digest[CURL_SHA256_DIGEST_LENGTH];
size_t CAinfo_blob_size; /* CA info blob size */
char *CAfile; /* CAfile path used to generate
certificate store */