From 9ddb4d1b208b25fcd675330f1dd36b679d257361 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Thu, 14 Sep 2023 00:54:14 -0700
Subject: [PATCH] Correct CRYPT_ACQUIRE_FLAGS

---
 generation/WinSDK/enums.json        | 24 ++++--------------------
 scripts/ChangesSinceLastRelease.txt | 11 +++++++++++
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
index 09366750d..200796f0a 100644
--- a/generation/WinSDK/enums.json
+++ b/generation/WinSDK/enums.json
@@ -10922,26 +10922,10 @@
   {
     "name": "CRYPT_ACQUIRE_FLAGS",
     "flags": true,
-    "members": [
-      {
-        "name": "CRYPT_ACQUIRE_CACHE_FLAG"
-      },
-      {
-        "name": "CRYPT_ACQUIRE_COMPARE_KEY_FLAG"
-      },
-      {
-        "name": "CRYPT_ACQUIRE_NO_HEALING"
-      },
-      {
-        "name": "CRYPT_ACQUIRE_SILENT_FLAG"
-      },
-      {
-        "name": "CRYPT_ACQUIRE_USE_PROV_INFO_FLAG"
-      },
-      {
-        "name": "CRYPT_ACQUIRE__WINDOWS_HANDLE_FLAG"
-      }
-    ],
+    "autoPopulate": {
+      "header": "wincrypt.h",
+      "filter": "CRYPT_ACQUIRE_"
+    },
     "uses": [
       {
         "method": "CryptAcquireCertificatePrivateKey",
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index bc7ce82f1..df6e34944 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -1035,3 +1035,14 @@ Windows.Win32.Devices.DeviceAndDriverInstallation.CM_REMOVAL_POLICY added
 Windows.Win32.Devices.DeviceAndDriverInstallation.CM_REMOVAL_POLICY.CM_REMOVAL_POLICY_EXPECT_NO_REMOVAL added
 Windows.Win32.Devices.DeviceAndDriverInstallation.CM_REMOVAL_POLICY.CM_REMOVAL_POLICY_EXPECT_ORDERLY_REMOVAL added
 Windows.Win32.Devices.DeviceAndDriverInstallation.CM_REMOVAL_POLICY.CM_REMOVAL_POLICY_EXPECT_SURPRISE_REMOVAL added
+# Correct CRYPT_ACQUIRE_FLAGS
+Windows.Win32.Security.Cryptography.Apis.CRYPT_ACQUIRE_ALLOW_NCRYPT_KEY_FLAG removed
+Windows.Win32.Security.Cryptography.Apis.CRYPT_ACQUIRE_NCRYPT_KEY_FLAGS_MASK removed
+Windows.Win32.Security.Cryptography.Apis.CRYPT_ACQUIRE_ONLY_NCRYPT_KEY_FLAG removed
+Windows.Win32.Security.Cryptography.Apis.CRYPT_ACQUIRE_PREFER_NCRYPT_KEY_FLAG removed
+Windows.Win32.Security.Cryptography.Apis.CRYPT_ACQUIRE_WINDOW_HANDLE_FLAG removed
+Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_ALLOW_NCRYPT_KEY_FLAG added
+Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_NCRYPT_KEY_FLAGS_MASK added
+Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_ONLY_NCRYPT_KEY_FLAG added
+Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_PREFER_NCRYPT_KEY_FLAG added
+Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_WINDOW_HANDLE_FLAG added