7 files changed, 2 insertions, 302 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 2c8231f8..dea1f47d 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -340,15 +340,6 @@ namespace WixToolset.Core.Burn
                 command.Execute();
             }
 
-            // If catalog files exist, non-embedded payloads should validate with the catalogs.
-            var catalogs = section.Symbols.OfType<WixBundleCatalogSymbol>().ToList();
-
-            if (catalogs.Count > 0)
-            {
-                var command = new VerifyPayloadsWithCatalogCommand(this.Messaging, catalogs, payloadSymbols.Values);
-                command.Execute();
-            }
-
             if (this.Messaging.EncounteredError)
             {
                 return;
@@ -456,7 +447,7 @@ namespace WixToolset.Core.Burn
             {
                 var executableName = Path.GetFileName(this.OutputPath);
 
-                var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleSymbol, containers, chainSymbol, orderedFacades, boundaries, uxPayloads, payloadSymbols, orderedSearches, catalogs, this.IntermediateFolder);
+                var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleSymbol, containers, chainSymbol, orderedFacades, boundaries, uxPayloads, payloadSymbols, orderedSearches, this.IntermediateFolder);
                 command.Execute();
 
                 manifestPath = command.OutputPath;
diff --git a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
index 24a4ae67..93a1a0bc 100644
--- a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
@@ -63,7 +63,6 @@ namespace WixToolset.Core.Burn.Bind
                     case SymbolDefinitionType.WixBootstrapperApplication:
                     case SymbolDefinitionType.WixBootstrapperApplicationDll:
                     case SymbolDefinitionType.WixBundle:
-                    case SymbolDefinitionType.WixBundleCatalog:
                     case SymbolDefinitionType.WixBundleContainer:
                     case SymbolDefinitionType.WixBundleCustomDataAttribute:
                     case SymbolDefinitionType.WixBundleExePackage:
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 6eafcdd9..d12f00d1 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class CreateBurnManifestCommand
     {
-        public CreateBurnManifestCommand(IMessaging messaging, IEnumerable<IBurnBackendExtension> backendExtensions, string executableName, IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable<WixBundleContainerSymbol> containers, WixChainSymbol chainSymbol, IEnumerable<PackageFacade> orderedPackages, IEnumerable<WixBundleRollbackBoundarySymbol> boundaries, IEnumerable<WixBundlePayloadSymbol> uxPayloads, Dictionary<string, WixBundlePayloadSymbol> allPayloadsById, IEnumerable<ISearchFacade> orderedSearches, IEnumerable<WixBundleCatalogSymbol> catalogs, string intermediateFolder)
+        public CreateBurnManifestCommand(IMessaging messaging, IEnumerable<IBurnBackendExtension> backendExtensions, string executableName, IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable<WixBundleContainerSymbol> containers, WixChainSymbol chainSymbol, IEnumerable<PackageFacade> orderedPackages, IEnumerable<WixBundleRollbackBoundarySymbol> boundaries, IEnumerable<WixBundlePayloadSymbol> uxPayloads, Dictionary<string, WixBundlePayloadSymbol> allPayloadsById, IEnumerable<ISearchFacade> orderedSearches, string intermediateFolder)
         {
             this.Messaging = messaging;
             this.BackendExtensions = backendExtensions;
@@ -32,7 +32,6 @@ namespace WixToolset.Core.Burn.Bundles
             this.UXContainerPayloads = uxPayloads;
             this.Payloads = allPayloadsById;
             this.OrderedSearches = orderedSearches;
-            this.Catalogs = catalogs;
             this.IntermediateFolder = intermediateFolder;
         }
 
@@ -62,8 +61,6 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IEnumerable<WixBundlePayloadSymbol> UXContainerPayloads { get; }
 
-        private IEnumerable<WixBundleCatalogSymbol> Catalogs { get; }
-
         private string IntermediateFolder { get; }
 
         public void Execute()
@@ -179,18 +176,6 @@ namespace WixToolset.Core.Burn.Bundles
 
                 writer.WriteEndElement(); // </UX>
 
-                // write the catalog elements
-                if (this.Catalogs.Any())
-                {
-                    foreach (var catalog in this.Catalogs)
-                    {
-                        writer.WriteStartElement("Catalog");
-                        writer.WriteAttributeString("Id", catalog.Id.Id);
-                        writer.WriteAttributeString("Payload", catalog.PayloadRef);
-                        writer.WriteEndElement();
-                    }
-                }
-
                 foreach (var container in this.Containers)
                 {
                     if (!String.IsNullOrEmpty(container.WorkingPath) && BurnConstants.BurnUXContainerName != container.Id.Id)
@@ -698,16 +683,6 @@ namespace WixToolset.Core.Burn.Bundles
                 writer.WriteAttributeString("LayoutOnly", "yes");
             }
 
-            if (!String.IsNullOrEmpty(payload.PublicKey))
-            {
-                writer.WriteAttributeString("CertificateRootPublicKeyIdentifier", payload.PublicKey);
-            }
-
-            if (!String.IsNullOrEmpty(payload.Thumbprint))
-            {
-                writer.WriteAttributeString("CertificateRootThumbprint", payload.Thumbprint);
-            }
-
             switch (payload.Packaging)
             {
                 case PackagingType.Embedded: // this means it's in a container.
@@ -742,11 +717,6 @@ namespace WixToolset.Core.Burn.Bundles
                     writer.WriteAttributeString("SourcePath", payload.Name);
                     break;
             }
-
-            if (!String.IsNullOrEmpty(payload.CatalogRef))
-            {
-                writer.WriteAttributeString("Catalog", payload.CatalogRef);
-            }
         }
 
         private string ResolveUrl(string url, string fallbackUrl, string packageId, string payloadId, string fileName)
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index 7adbfcfd..e13561bc 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -406,7 +406,6 @@ namespace WixToolset.Core.Burn.Bundles
                                 PackageRef = packagePayload.PackageRef,
                                 ContainerRef = packagePayload.ContainerRef,
                                 ContentFile = true,
-                                EnableSignatureValidation = packagePayload.EnableSignatureValidation,
                                 Packaging = packagePayload.Packaging,
                                 ParentPackagePayloadRef = packagePayload.Id.Id,
                             });
@@ -484,7 +483,6 @@ namespace WixToolset.Core.Burn.Bundles
                                         PackageRef = packagePayload.PackageRef,
                                         ContainerRef = packagePayload.ContainerRef,
                                         ContentFile = true,
-                                        EnableSignatureValidation = packagePayload.EnableSignatureValidation,
                                         Packaging = packagePayload.Packaging,
                                         ParentPackagePayloadRef = packagePayload.Id.Id,
                                     });
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
index 69c4d7c2..8811c301 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
@@ -6,9 +6,6 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
-    using System.Security.Cryptography;
-    using System.Security.Cryptography.X509Certificates;
-    using System.Text;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
     using WixToolset.Data.Symbols;
@@ -123,37 +120,6 @@ namespace WixToolset.Core.Burn.Bundles
                 payload.FileSize = (int)fileInfo.Length;
 
                 payload.Hash = BundleHashAlgorithm.Hash(fileInfo);
-
-                // Try to get the certificate if the payload is a signed file and we're not suppressing signature validation.
-                if (payload.EnableSignatureValidation)
-                {
-                    X509Certificate2 certificate = null;
-                    try
-                    {
-                        certificate = new X509Certificate2(fileInfo.FullName);
-                    }
-                    catch (CryptographicException) // we don't care about non-signed files.
-                    {
-                    }
-
-                    // If there is a certificate, remember its hashed public key identifier and thumbprint.
-                    if (null != certificate)
-                    {
-                        byte[] publicKeyIdentifierHash = new byte[128];
-                        uint publicKeyIdentifierHashSize = (uint)publicKeyIdentifierHash.Length;
-
-                        Native.NativeMethods.HashPublicKeyInfo(certificate.Handle, publicKeyIdentifierHash, ref publicKeyIdentifierHashSize);
-
-                        var sb = new StringBuilder(((int)publicKeyIdentifierHashSize + 1) * 2);
-                        for (var i = 0; i < publicKeyIdentifierHashSize; ++i)
-                        {
-                            sb.AppendFormat("{0:X2}", publicKeyIdentifierHash[i]);
-                        }
-
-                        payload.PublicKey = sb.ToString();
-                        payload.Thumbprint = certificate.Thumbprint;
-                    }
-                }
             }
             else
             {
diff --git a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
deleted file mode 100644
index e7c97ea7..00000000
--- a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Core.Burn.Bundles
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Extensibility.Services;
-
-    internal class VerifyPayloadsWithCatalogCommand
-    {
-        public VerifyPayloadsWithCatalogCommand(IMessaging messaging, IEnumerable<WixBundleCatalogSymbol> catalogs, IEnumerable<WixBundlePayloadSymbol> payloads)
-        {
-            this.Messaging = messaging;
-            this.Catalogs = catalogs;
-            this.Payloads = payloads;
-        }
-
-        private IMessaging Messaging { get; }
-
-        private IEnumerable<WixBundleCatalogSymbol> Catalogs { get; }
-
-        private IEnumerable<WixBundlePayloadSymbol> Payloads { get; }
-
-        public void Execute()
-        {
-            var catalogIdsWithPaths = this.Catalogs
-                .Join(this.Payloads,
-                    catalog => catalog.PayloadRef,
-                    payload => payload.Id.Id,
-                    (catalog, payload) => new CatalogIdWithPath() { Id = catalog.Id.Id, FullPath = Path.GetFullPath(payload.SourceFile.Path) })
-                .ToList();
-
-            foreach (var payloadInfo in this.Payloads)
-            {
-                // Payloads that are not embedded should be verfied.
-                if (String.IsNullOrEmpty(payloadInfo.EmbeddedId))
-                {
-                    var sourceFile = payloadInfo.SourceFile.Path;
-                    var validated = false;
-
-                    foreach (var catalog in catalogIdsWithPaths)
-                    {
-                        if (!validated)
-                        {
-                            // Get the file hash
-                            uint cryptHashSize = 20;
-                            byte[] cryptHashBytes = new byte[cryptHashSize];
-                            int error;
-                            using (var payloadStream = File.OpenRead(sourceFile))
-                            {
-                                // Get the file handle
-                                var fileHandle = payloadStream.SafeFileHandle.DangerousGetHandle();
-
-                                // 20 bytes is usually the hash size.  Future hashes may be bigger
-                                if (!VerifyInterop.CryptCATAdminCalcHashFromFileHandle(fileHandle, ref cryptHashSize, cryptHashBytes, 0))
-                                {
-                                    error = Marshal.GetLastWin32Error();
-
-                                    if (VerifyInterop.ErrorInsufficientBuffer == error)
-                                    {
-                                        error = 0;
-                                        cryptHashBytes = new byte[cryptHashSize];
-                                        if (!VerifyInterop.CryptCATAdminCalcHashFromFileHandle(fileHandle, ref cryptHashSize, cryptHashBytes, 0))
-                                        {
-                                            error = Marshal.GetLastWin32Error();
-                                        }
-                                    }
-
-                                    if (0 != error)
-                                    {
-                                        this.Messaging.Write(ErrorMessages.CatalogFileHashFailed(sourceFile, error));
-                                    }
-                                }
-                            }
-
-                            VerifyInterop.WinTrustCatalogInfo catalogData = new VerifyInterop.WinTrustCatalogInfo();
-                            VerifyInterop.WinTrustData trustData = new VerifyInterop.WinTrustData();
-                            try
-                            {
-                                // Create WINTRUST_CATALOG_INFO structure
-                                catalogData.cbStruct = (uint)Marshal.SizeOf(catalogData);
-                                catalogData.cbCalculatedFileHash = cryptHashSize;
-                                catalogData.pbCalculatedFileHash = Marshal.AllocCoTaskMem((int)cryptHashSize);
-                                Marshal.Copy(cryptHashBytes, 0, catalogData.pbCalculatedFileHash, (int)cryptHashSize);
-
-                                var hashString = new StringBuilder();
-                                foreach (var hashByte in cryptHashBytes)
-                                {
-                                    hashString.Append(hashByte.ToString("X2"));
-                                }
-                                catalogData.pcwszMemberTag = hashString.ToString();
-
-                                // The file names need to be lower case for older OSes
-                                catalogData.pcwszMemberFilePath = sourceFile.ToLowerInvariant();
-                                catalogData.pcwszCatalogFilePath = catalog.FullPath.ToLowerInvariant();
-
-                                // Create WINTRUST_DATA structure
-                                trustData.cbStruct = (uint)Marshal.SizeOf(trustData);
-                                trustData.dwUIChoice = VerifyInterop.WTD_UI_NONE;
-                                trustData.fdwRevocationChecks = VerifyInterop.WTD_REVOKE_NONE;
-                                trustData.dwUnionChoice = VerifyInterop.WTD_CHOICE_CATALOG;
-                                trustData.dwStateAction = VerifyInterop.WTD_STATEACTION_VERIFY;
-                                trustData.dwProvFlags = VerifyInterop.WTD_REVOCATION_CHECK_NONE;
-
-                                // Create the structure pointers for unmanaged
-                                trustData.pCatalog = Marshal.AllocCoTaskMem(Marshal.SizeOf(catalogData));
-                                Marshal.StructureToPtr(catalogData, trustData.pCatalog, false);
-
-                                // Call WinTrustVerify to validate the file with the catalog
-                                IntPtr noWindow = new IntPtr(-1);
-                                Guid verifyGuid = new Guid(VerifyInterop.GenericVerify2);
-                                long verifyResult = VerifyInterop.WinVerifyTrust(noWindow, ref verifyGuid, ref trustData);
-                                if (0 == verifyResult)
-                                {
-                                    payloadInfo.CatalogRef = catalog.Id;
-                                    validated = true;
-                                    break;
-                                }
-                            }
-                            finally
-                            {
-                                // Free the structure memory
-                                if (IntPtr.Zero != trustData.pCatalog)
-                                {
-                                    Marshal.FreeCoTaskMem(trustData.pCatalog);
-                                }
-
-                                if (IntPtr.Zero != catalogData.pbCalculatedFileHash)
-                                {
-                                    Marshal.FreeCoTaskMem(catalogData.pbCalculatedFileHash);
-                                }
-                            }
-                        }
-                    }
-
-                    // Error message if the file was not validated by one of the catalogs
-                    if (!validated)
-                    {
-                        this.Messaging.Write(ErrorMessages.CatalogVerificationFailed(sourceFile));
-                    }
-                }
-            }
-        }
-
-        private class CatalogIdWithPath
-        {
-            public string Id { get; set; }
-
-            public string FullPath { get; set; }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.Burn/VerifyInterop.cs b/src/WixToolset.Core.Burn/VerifyInterop.cs
deleted file mode 100644
index f021f1d0..00000000
--- a/src/WixToolset.Core.Burn/VerifyInterop.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset
-{
-    using System;
-    using System.Runtime.InteropServices;
-
-    internal class VerifyInterop
-    {
-        internal const string GenericVerify2 = "00AAC56B-CD44-11d0-8CC2-00C04FC295EE";
-        internal const uint WTD_UI_NONE = 2;
-        internal const uint WTD_REVOKE_NONE = 0;
-        internal const uint WTD_CHOICE_CATALOG = 2;
-        internal const uint WTD_STATEACTION_VERIFY = 1;
-        internal const uint WTD_REVOCATION_CHECK_NONE = 0x10;
-        internal const int ErrorInsufficientBuffer = 122;
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct WinTrustData
-        {
-            internal uint cbStruct;
-            internal IntPtr pPolicyCallbackData;
-            internal IntPtr pSIPClientData;
-            internal uint dwUIChoice;
-            internal uint fdwRevocationChecks;
-            internal uint dwUnionChoice;
-            internal IntPtr pCatalog;
-            internal uint dwStateAction;
-            internal IntPtr hWVTStateData;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            internal string pwszURLReference;
-            internal uint dwProvFlags;
-            internal uint dwUIContext;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct WinTrustCatalogInfo
-        {
-            internal uint cbStruct;
-            internal uint dwCatalogVersion;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            internal string pcwszCatalogFilePath;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            internal string pcwszMemberTag;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            internal string pcwszMemberFilePath;
-            internal IntPtr hMemberFile;
-            internal IntPtr pbCalculatedFileHash;
-            internal uint cbCalculatedFileHash;
-            internal IntPtr pcCatalogContext;
-        }
-
-        [DllImport("wintrust.dll", SetLastError = true)]
-        internal static extern long WinVerifyTrust(IntPtr windowHandle, ref Guid actionGuid, ref WinTrustData trustData);
-
-        [DllImport("wintrust.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool CryptCATAdminCalcHashFromFileHandle(
-            IntPtr fileHandle,
-            [In, Out]
-            ref uint hashSize,
-            [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)]
-            byte[] hashBytes,
-            uint flags);
-    }
-}