Revert "schannel: when importing PFX, disable key persistence"
This reverts commit 70d010d285.
Due to further reports in #9300 that indicate this commit might
introduce problems.
This commit is contained in:
parent
7632c0d25a
commit
aec8d30624
@ -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)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user