Make System.Security.Cryptography.X509Certificates compliant with int…

…erop guidelines - part 2

Convert more of S.S.C.X509Certificates to use correct interop style.

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CRYPT_KEY_PROV_INFO_ANSI.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        internal unsafe struct CRYPT_KEY_PROV_INFO
+        {
+            internal char* pwszContainerName;
+            internal char* pwszProvName;
+            internal int dwProvType;
+            internal CryptAcquireContextFlags dwFlags;
+            internal int cProvParam;
+            internal IntPtr rgProvParam;
+            internal int dwKeySpec;
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertAddCertificateContextToStore.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial bool CertAddCertificateContextToStore(SafeCertStoreHandle hCertStore, SafeCertContextHandle pCertContext, CertStoreAddDisposition dwAddDisposition, IntPtr ppStoreContext);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertAddCertificateLinkToStore_CertStoreAddDisposition.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial bool CertAddCertificateLinkToStore(SafeCertStoreHandle hCertStore, SafeCertContextHandle pCertContext, CertStoreAddDisposition dwAddDisposition, IntPtr ppStoreContext);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertDuplicateCertificateChain.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, SetLastError = true)]
+        internal static partial SafeX509ChainHandle CertDuplicateCertificateChain(IntPtr pChainContext);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertDuplicateCertificateContextWithKeyContainerDeletion.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, EntryPoint = "CertDuplicateCertificateContext", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial SafeCertContextHandleWithKeyContainerDeletion CertDuplicateCertificateContextWithKeyContainerDeletion(IntPtr pCertContext);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertDuplicateStore.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, SetLastError = true)]
+        internal static partial SafeCertStoreHandle CertDuplicateStore(IntPtr hCertStore);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertEnumCertificatesInStore_SafeCertStoreHandle.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static unsafe partial CERT_CONTEXT* CertEnumCertificatesInStore(SafeCertStoreHandle hCertStore, CERT_CONTEXT* pPrevCertContext);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertGetCertificateContextPropertyString.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, EntryPoint = "CertGetCertificateContextProperty", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static unsafe partial bool CertGetCertificateContextPropertyString(SafeCertContextHandle pCertContext, CertContextPropId dwPropId, byte* pvData, ref int pcbData);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertGetNameString.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, EntryPoint = "CertGetNameStringW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static unsafe partial int CertGetNameString(SafeCertContextHandle pCertContext, CertNameType dwType, CertNameFlags dwFlags, in CertNameStringType pvTypePara, char* pszNameString, int cchNameString);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertNameFlags.cs

@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [Flags]
+        internal enum CertNameFlags : int
+        {
+            None = 0x00000000,
+            CERT_NAME_ISSUER_FLAG = 0x00000001,
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertNameStringType.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        internal enum CertNameStringType : int
+        {
+            CERT_X500_NAME_STR = 3,
+            CERT_NAME_STR_REVERSE_FLAG = 0x02000000,
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertNameType.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        internal enum CertNameType : int
+        {
+            CERT_NAME_EMAIL_TYPE = 1,
+            CERT_NAME_RDN_TYPE = 2,
+            CERT_NAME_ATTR_TYPE = 3,
+            CERT_NAME_SIMPLE_DISPLAY_TYPE = 4,
+            CERT_NAME_FRIENDLY_DISPLAY_TYPE = 5,
+            CERT_NAME_DNS_TYPE = 6,
+            CERT_NAME_URL_TYPE = 7,
+            CERT_NAME_UPN_TYPE = 8,
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertOpenStore_ENUM.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial SafeCertStoreHandle CertOpenStore(IntPtr lpszStoreProvider, CertEncodingType dwMsgAndCertEncodingType, IntPtr hCryptProv, CertStoreFlags dwFlags, [MarshalAs(UnmanagedType.LPWStr)] string? pvPara);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertSerializeCertificateStoreElement.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial bool CertSerializeCertificateStoreElement(SafeCertContextHandle pCertContext, int dwFlags, byte[]? pbElement, ref int pcbElement);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertSetCertificateContextProperty_CRYPT_KEY_PROV_INFO.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static unsafe partial bool CertSetCertificateContextProperty(SafeCertContextHandle pCertContext, CertContextPropId dwPropId, CertSetPropertyFlags dwFlags, CRYPT_KEY_PROV_INFO* pvData);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertSetCertificateContextProperty_DATA_BLOB.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static unsafe partial bool CertSetCertificateContextProperty(SafeCertContextHandle pCertContext, CertContextPropId dwPropId, CertSetPropertyFlags dwFlags, DATA_BLOB* pvData);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertSetCertificateContextProperty_SafeNCryptKeyHandle.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static unsafe partial bool CertSetCertificateContextProperty(SafeCertContextHandle pCertContext, CertContextPropId dwPropId, CertSetPropertyFlags dwFlags, SafeNCryptKeyHandle keyHandle);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertSetPropertyFlags.cs

@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [Flags]
+        internal enum CertSetPropertyFlags : int
+        {
+            CERT_SET_PROPERTY_INHIBIT_PERSIST_FLAG = 0x40000000,
+            None = 0x00000000,
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertStoreAddDisposition.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        internal enum CertStoreAddDisposition : int
+        {
+            CERT_STORE_ADD_NEW                                  = 1,
+            CERT_STORE_ADD_USE_EXISTING                         = 2,
+            CERT_STORE_ADD_REPLACE_EXISTING                     = 3,
+            CERT_STORE_ADD_ALWAYS                               = 4,
+            CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES  = 5,
+            CERT_STORE_ADD_NEWER                                = 6,
+            CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES             = 7,
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertStoreFlags.cs

@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [Flags]
+        internal enum CertStoreFlags : int
+        {
+            CERT_STORE_NO_CRYPT_RELEASE_FLAG                = 0x00000001,
+            CERT_STORE_SET_LOCALIZED_NAME_FLAG              = 0x00000002,
+            CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG     = 0x00000004,
+            CERT_STORE_DELETE_FLAG                          = 0x00000010,
+            CERT_STORE_UNSAFE_PHYSICAL_FLAG                 = 0x00000020,
+            CERT_STORE_SHARE_STORE_FLAG                     = 0x00000040,
+            CERT_STORE_SHARE_CONTEXT_FLAG                   = 0x00000080,
+            CERT_STORE_MANIFOLD_FLAG                        = 0x00000100,
+            CERT_STORE_ENUM_ARCHIVED_FLAG                   = 0x00000200,
+            CERT_STORE_UPDATE_KEYID_FLAG                    = 0x00000400,
+            CERT_STORE_BACKUP_RESTORE_FLAG                  = 0x00000800,
+            CERT_STORE_READONLY_FLAG                        = 0x00008000,
+            CERT_STORE_OPEN_EXISTING_FLAG                   = 0x00004000,
+            CERT_STORE_CREATE_NEW_FLAG                      = 0x00002000,
+            CERT_STORE_MAXIMUM_ALLOWED_FLAG                 = 0x00001000,
+            CERT_SYSTEM_STORE_CURRENT_USER                  = 0x00010000,
+            CERT_SYSTEM_STORE_LOCAL_MACHINE                 = 0x00020000,
+            None                                            = 0x00000000,
+        }
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertStrToName.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [GeneratedDllImport(Libraries.Crypt32, EntryPoint = "CertStrToNameW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial bool CertStrToName(CertEncodingType dwCertEncodingType, string pszX500, CertNameStrTypeAndFlags dwStrType, IntPtr pvReserved, byte[]? pbEncoded, ref int pcbEncoded, IntPtr ppszError);
+    }
+}

src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CryptAcquireContextFlags.cs

@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+internal static partial class Interop
+{
+    internal static partial class Crypt32
+    {
+        [Flags]
+        internal enum CryptAcquireContextFlags : int
+        {
+            CRYPT_DELETEKEYSET = 0x00000010,
+            CRYPT_MACHINE_KEYSET = 0x00000020,
+            None = 0x00000000,
+        }
+    }
+}