From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 29 Aug 2022 06:16:16 +0000 (+0200)
Subject: Revert "schannel: when importing PFX, disable key persistence"
X-Git-Tag: curl-7_85_0~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aec8d30;p=thirdparty%2Fcurl.git

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

This reverts commit 70d010d285315e5f1cad6bdb4953e167b069b692.

Due to further reports in #9300 that indicate this commit might
introduce problems.
---

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 4ad0ee861d..32abcaa744 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -186,10 +186,6 @@
 #define ALG_CLASS_DHASH ALG_CLASS_HASH
 #endif
 
-#ifndef PKCS12_NO_PERSIST_KEY
-#define PKCS12_NO_PERSIST_KEY 0x00008000
-#endif
-
 static Curl_recv schannel_recv;
 static Curl_send schannel_send;
 
@@ -680,13 +676,7 @@ schannel_acquire_credential_handle(struct Curl_easy *data,
         else
           pszPassword[0] = 0;
 
-        if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
-                                        VERSION_GREATER_THAN_EQUAL))
-          cert_store = PFXImportCertStore(&datablob, pszPassword,
-                                          PKCS12_NO_PERSIST_KEY);
-        else
-          cert_store = PFXImportCertStore(&datablob, pszPassword, 0);
-
+        cert_store = PFXImportCertStore(&datablob, pszPassword, 0);
         free(pszPassword);
       }
       if(!blob)