Support "Details" button & Cleanup

Author: ferrariofilippo

src/Files.App/Data/Items/CertNodeInfoItem.cs

@@ -11,14 +11,8 @@ public class CertNodeInfoItem
 
         public string Version { get; set; } = string.Empty;
 
-        public string SerialNumber { get; set; } = string.Empty;
-
-        public string Thumbprint { get; set; } = string.Empty;
-
         public string ValidFrom { get; set; } = string.Empty;
 
         public string ValidTo { get; set; } = string.Empty;
-
-        public string SignAlgorithm { get; set; } = string.Empty;
     }
 }

src/Files.App/Data/Models/SignatureInfoItem.cs

@@ -1,12 +1,19 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Utils.Signatures;
 using System.Windows.Input;
 
 namespace Files.App.Data.Models
 {
     public sealed partial class SignatureInfoItem : ObservableObject
     {
+        private readonly string _fileName;
+
+        private readonly IntPtr _hwndParent;
+
+        private readonly int _index;
+
         private string _Version = string.Empty;
         public string Version
         {
@@ -66,14 +73,18 @@ public bool Verified
 
         public ICommand OpenDetailsCommand { get; }
 
-        public SignatureInfoItem(List<CertNodeInfoItem> chain)
+        public SignatureInfoItem(string fileName, int index, IntPtr hWnd, List<CertNodeInfoItem> chain)
         {
+            _fileName = fileName;
+            _hwndParent = hWnd;
+            _index = index;
             SignChain = chain ?? new List<CertNodeInfoItem>();
             OpenDetailsCommand = new AsyncRelayCommand(DoOpenDetails);
         }
 
         private Task DoOpenDetails()
         {
+            DigitalSignaturesUtil.DisplaySignerInfoDialog(_fileName, _hwndParent, _index);
             return Task.CompletedTask;
         }
     }

src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs

@@ -415,15 +415,6 @@ public static extern bool CryptDecodeObject(
             ref uint pcbStructInfo
         );
 
-        [DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern bool CryptBinaryToStringA(
-            IntPtr pbBinary,
-            uint cbBinary,
-            uint dwFlags,
-            IntPtr pszString,
-            ref uint pcchString
-        );
-
         [DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         public static extern IntPtr CertFindCertificateInStore(
             IntPtr hCertStore,
@@ -462,70 +453,13 @@ public static extern bool CertCloseStore(
             uint dwFlags
         );
 
-        // wintrust.dll
-        [DllImport("wintrust.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern bool CryptCATAdminCalcHashFromFileHandle(
-            IntPtr hFile,
-            ref uint pdwHash,
-            IntPtr pReserved,
-            uint dwFlags
-        );
-
         [DllImport("wintrust.dll")]
         public static extern long WinVerifyTrust(
             IntPtr hwnd,
             IntPtr pgActionID,
             IntPtr pWVTData
         );
 
-        // ncrypt.dll
-        [DllImport("ncrypt.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern bool BCryptDestroyHash(
-            IntPtr hHash
-        );
-
-        [DllImport("ncrypt.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern uint BCryptFinishHash(
-            IntPtr hHash,
-            IntPtr pbOutput,
-            uint cbOutput,
-            uint dwFlags
-        );
-
-        [DllImport("ncrypt.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern uint BCryptOpenAlgorithmProvider(
-            out IntPtr phAlgorithm,
-            string pszAlgId,
-            string pszImplementation,
-            uint dwFlags
-        );
-
-        [DllImport("ncrypt.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern uint BCryptCloseAlgorithmProvider(
-            IntPtr hAlgorithm,
-            uint dwFlags
-        );
-
-        [DllImport("ncrypt.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern uint BCryptCreateHash(
-            IntPtr hAlgorithm,
-            out IntPtr hHash,
-            IntPtr pbHashObject,
-            uint cbHashObject,
-            IntPtr pbSecret,
-            uint cbSecret,
-            uint flags
-        );
-
-
-        [DllImport("ncrypt.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern uint BCryptHashData(
-            IntPtr hHash,
-            IntPtr pbInput,
-            uint cbInput,
-            uint dwFlags
-        );
-
         // kernel32.dll
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         public static extern bool FileTimeToSystemTime(
@@ -544,5 +478,9 @@ public static extern bool SystemTimeToFileTime(
             IntPtr lpSystemTime,
             IntPtr lpFileTime
         );
+
+        // cryptui.dll
+        [DllImport("cryptui.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern bool CryptUIDlgViewSignerInfo(IntPtr pViewInfo);
     }
 }

src/Files.App/Helpers/Win32/Win32PInvoke.Structs.cs

@@ -257,13 +257,6 @@ public struct CERT_ALT_NAME_INFO
             public IntPtr rgAltEntry;
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        public struct CRL_DIST_POINT_NAME
-        {
-            public uint dwDistPointNameChoice;
-            public CERT_ALT_NAME_INFO FullName;
-        }
-
         [StructLayout(LayoutKind.Sequential)]
         public struct CERT_CONTEXT
         {
@@ -343,5 +336,22 @@ public struct WINTRUST_DATA
             public uint dwUIContext;
             public IntPtr pSignatureSettings;
         }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public struct CRYPTUI_VIEWSIGNERINFO_STRUCT
+        {
+            public uint dwSize;
+            public IntPtr hwndParent;
+            public uint dwFlags;
+            public IntPtr szTitle;
+            public IntPtr pSignerInfo;
+            public IntPtr hMsg;
+            public IntPtr pszOID;
+            public uint? dwReserved;
+            public uint cStores;
+            public IntPtr rghStores;
+            public uint cPropPages;
+            public IntPtr rgPropPages;
+        }
     }
 }