added machine keys for enumeration

Author: Crypt32

WinCryptKeyExplorer/Models/CspProviderVM.cs

@@ -98,40 +98,43 @@ public Boolean IsBusy {
         public void EnumKeys() {
             IsBusy = true;
             Keys.Clear();
-            try {
-                Int32 hresult = NCryptOpenStorageProvider(out SafeNCryptProviderHandle phProvider, Name, 0x00000040);
-                if (hresult > 0) {
-                    MsgBox.Show("Error", "Failed to open provider:\n" + new Win32Exception(hresult).Message);
+            foreach (UInt32 flags in new[] { 0x40, 0x60 }) {
+                try {
+                    Int32 hresult = NCryptOpenStorageProvider(out SafeNCryptProviderHandle phProvider, Name, 0);
+                    if (hresult > 0) {
+                        MsgBox.Show("Error", "Failed to open provider:\n" + new Win32Exception(hresult).Message);
 
-                    return;
-                }
+                        return;
+                    }
 
-                IntPtr ppKeyName = IntPtr.Zero;
-                IntPtr ppEnumState = IntPtr.Zero;
-                do {
-                    hresult = NCryptEnumKeys(phProvider, null, ref ppKeyName, ref ppEnumState, 0x00000040);
-                    if (hresult == 0) {
-                        NCryptKeyName keyStruct = Marshal.PtrToStructure<NCryptKeyName>(ppKeyName);
-                        Keys.Add(new KeyContainerVM {
-                            KeyName = keyStruct.pszName,
-                            Algorithm = keyStruct.pszAlgid,
-                            KeySpec = (X509KeySpec2)keyStruct.dwLegacyKeySpec,
-                            Flags = keyStruct.dwFlags
-                        });
+                    IntPtr ppKeyName = IntPtr.Zero;
+                    IntPtr ppEnumState = IntPtr.Zero;
+                    do {
+                        hresult = NCryptEnumKeys(phProvider, null, ref ppKeyName, ref ppEnumState, flags);
+                        if (hresult == 0) {
+                            NCryptKeyName keyStruct = Marshal.PtrToStructure<NCryptKeyName>(ppKeyName);
+                            Keys.Add(new KeyContainerVM {
+                                KeyName = keyStruct.pszName,
+                                Algorithm = keyStruct.pszAlgid,
+                                KeySpec = (X509KeySpec2)keyStruct.dwLegacyKeySpec,
+                                Flags = keyStruct.dwFlags
+                            });
 
-                        NCryptFreeObject(ppKeyName);
-                    } else {
-                        ppKeyName = IntPtr.Zero;
+                            NCryptFreeObject(ppKeyName);
+                        } else {
+                            ppKeyName = IntPtr.Zero;
+                        }
+                    } while (!IntPtr.Zero.Equals(ppKeyName));
+                    NCryptFreeObject(phProvider.DangerousGetHandle());
+                    if (!IntPtr.Zero.Equals(ppEnumState)) {
+                        NCryptFreeObject(ppEnumState);
                     }
-                } while (!IntPtr.Zero.Equals(ppKeyName));
-                NCryptFreeObject(phProvider.DangerousGetHandle());
-                if (!IntPtr.Zero.Equals(ppEnumState)) {
-                    NCryptFreeObject(ppEnumState);
+                } catch (Exception ex) {
+                    MsgBox.Show("Error", "Failed to enumerate keys:\n" + ex.Message);
                 }
-            } catch (Exception ex) {
-                MsgBox.Show("Error", "Failed to enumerate keys:\n" + ex.Message);
             }
 
+
             IsBusy = false;
         }
     }

WinCryptKeyExplorer/Models/KeyContainerVM.cs

@@ -5,6 +5,6 @@ public class KeyContainerVM {
         public String KeyName { get; set; }
         public String Algorithm { get; set; }
         public X509KeySpec2 KeySpec { get; set; }
-        public UInt32 Flags { get; set; }
+        public KeyFlags Flags { get; set; }
     }
 }

WinCryptKeyExplorer/Models/KeyFlags.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace WinCryptKeyExplorer.Models {
+    [Flags]
+    public enum KeyFlags : UInt32 {
+        None                  = 0,
+        MachineKeySet         = 0x20,
+        Silent                = 0x40,
+        OverwriteKey          = 0x80,
+        WriteKeyToLegacyStore = 0x200,
+        DoNotFinalize         = 0x400,
+        PersistOnly           = 0x40000000,
+        Persist               = 0x80000000
+    }
+}

WinCryptKeyExplorer/Utils/Win32.cs

@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using Microsoft.Win32.SafeHandles;
+using WinCryptKeyExplorer.Models;
 
 namespace WinCryptKeyExplorer.Utils {
     static class Win32 {
@@ -60,7 +61,7 @@ public struct NCryptKeyName {
             [MarshalAs(UnmanagedType.LPWStr)]
             public String pszAlgid;
             public Int32 dwLegacyKeySpec;
-            public UInt32 dwFlags;
+            public KeyFlags dwFlags;
         }
     }
 }

WinCryptKeyExplorer/WinCryptKeyExplorer.csproj

@@ -76,6 +76,7 @@
     </ApplicationDefinition>
     <Compile Include="Models\AlgorithmOperationFlags2.cs" />
     <Compile Include="Models\AlgorithmType.cs" />
+    <Compile Include="Models\KeyFlags.cs" />
     <Compile Include="Models\X509KeySpec2.cs" />
     <Compile Include="Models\CspProvAlg.cs" />
     <Compile Include="Models\KeyContainerVM.cs" />