From f1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 31 Jan 2021 19:28:47 -0500
Subject: Remove Burn Authenticode

Fixes https://github.com/wixtoolset/issues/issues/6301
---
 src/engine/payload.cpp | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'src/engine/payload.cpp')

diff --git a/src/engine/payload.cpp b/src/engine/payload.cpp
index 6833288f..67eebe10 100644
--- a/src/engine/payload.cpp
+++ b/src/engine/payload.cpp
@@ -18,7 +18,6 @@ static HRESULT FindEmbeddedBySourcePath(
 extern "C" HRESULT PayloadsParseFromXml(
     __in BURN_PAYLOADS* pPayloads,
     __in_opt BURN_CONTAINERS* pContainers,
-    __in_opt BURN_CATALOGS* pCatalogs,
     __in IXMLDOMNode* pixnBundle
     )
 {
@@ -130,26 +129,6 @@ extern "C" HRESULT PayloadsParseFromXml(
             ExitOnFailure(hr, "Failed to parse @FileSize.");
         }
 
-        // @CertificateAuthorityKeyIdentifier
-        hr = XmlGetAttributeEx(pixnNode, L"CertificateRootPublicKeyIdentifier", &scz);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get @CertificateRootPublicKeyIdentifier.");
-
-            hr = StrAllocHexDecode(scz, &pPayload->pbCertificateRootPublicKeyIdentifier, &pPayload->cbCertificateRootPublicKeyIdentifier);
-            ExitOnFailure(hr, "Failed to hex decode @CertificateRootPublicKeyIdentifier.");
-        }
-
-        // @CertificateThumbprint
-        hr = XmlGetAttributeEx(pixnNode, L"CertificateRootThumbprint", &scz);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get @CertificateRootThumbprint.");
-
-            hr = StrAllocHexDecode(scz, &pPayload->pbCertificateRootThumbprint, &pPayload->cbCertificateRootThumbprint);
-            ExitOnFailure(hr, "Failed to hex decode @CertificateRootThumbprint.");
-        }
-
         // @Hash
         hr = XmlGetAttributeEx(pixnNode, L"Hash", &scz);
         ExitOnFailure(hr, "Failed to get @Hash.");
@@ -157,16 +136,6 @@ extern "C" HRESULT PayloadsParseFromXml(
         hr = StrAllocHexDecode(scz, &pPayload->pbHash, &pPayload->cbHash);
         ExitOnFailure(hr, "Failed to hex decode the Payload/@Hash.");
 
-        // @Catalog
-        hr = XmlGetAttributeEx(pixnNode, L"Catalog", &scz);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get @Catalog.");
-
-            hr = CatalogFindById(pCatalogs, scz, &pPayload->pCatalog);
-            ExitOnFailure(hr, "Failed to find catalog.");
-        }
-
         // prepare next iteration
         ReleaseNullObject(pixnNode);
     }
@@ -194,8 +163,6 @@ extern "C" void PayloadsUninitialize(
             ReleaseStr(pPayload->sczKey);
             ReleaseStr(pPayload->sczFilePath);
             ReleaseMem(pPayload->pbHash);
-            ReleaseMem(pPayload->pbCertificateRootThumbprint);
-            ReleaseMem(pPayload->pbCertificateRootPublicKeyIdentifier);
             ReleaseStr(pPayload->sczSourcePath);
             ReleaseStr(pPayload->sczLocalFilePath);
             ReleaseStr(pPayload->downloadSource.sczUrl);
-- 
cgit v1.2.3-55-g6feb