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

Revert "schannel: when importing PFX, disable key persistence"

Browse source 
This reverts commit 70d010d285.

Due to further reports in #9300 that indicate this commit might
introduce problems.
This commit is contained in:
Daniel Stenberg 2022-08-29 08:16:16 +02:00
parent 7632c0d25a
commit aec8d30624
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/vtls/schannel.c
View file

@ -186,10 +186,6 @@
#define ALG_CLASS_DHASH ALG_CLASS_HASH #define ALG_CLASS_DHASH ALG_CLASS_HASH
#endif #endif
#ifndef PKCS12_NO_PERSIST_KEY
#define PKCS12_NO_PERSIST_KEY 0x00008000
#endif
static Curl_recv schannel_recv; static Curl_recv schannel_recv;
static Curl_send schannel_send; static Curl_send schannel_send;
@ -680,13 +676,7 @@ schannel_acquire_credential_handle(struct Curl_easy *data,
else else
pszPassword[0] = 0; pszPassword[0] = 0;
if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT, cert_store = PFXImportCertStore(&datablob, pszPassword, 0);
VERSION_GREATER_THAN_EQUAL))
cert_store = PFXImportCertStore(&datablob, pszPassword,
PKCS12_NO_PERSIST_KEY);
else
cert_store = PFXImportCertStore(&datablob, pszPassword, 0);
free(pszPassword); free(pszPassword);
} }
if(!blob) if(!blob)