aboutsummaryrefslogtreecommitdiff
path: root/src/engine/manifest.cpp
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-01-31 19:28:47 -0500
committerBob Arnson <bob@firegiant.com>2021-01-31 19:35:27 -0500
commitf1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7 (patch)
tree6866de4e995d3ae55affff6c70e3d93175583c65 /src/engine/manifest.cpp
parent0e41fb8be9690ca7b81ec4df0734ead1978a9cf0 (diff)
downloadwix-f1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7.tar.gz
wix-f1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7.tar.bz2
wix-f1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7.zip
Remove Burn Authenticode
Fixes https://github.com/wixtoolset/issues/issues/6301
Diffstat (limited to 'src/engine/manifest.cpp')
-rw-r--r--src/engine/manifest.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/engine/manifest.cpp b/src/engine/manifest.cpp
index fe8c6cad..fa454348 100644
--- a/src/engine/manifest.cpp
+++ b/src/engine/manifest.cpp
@@ -132,10 +132,6 @@ static HRESULT ParseFromXml(
132 hr = SearchesParseFromXml(&pEngineState->searches, &pEngineState->extensions, pixeBundle); 132 hr = SearchesParseFromXml(&pEngineState->searches, &pEngineState->extensions, pixeBundle);
133 ExitOnFailure(hr, "Failed to parse searches."); 133 ExitOnFailure(hr, "Failed to parse searches.");
134 134
135 // parse catalog files
136 hr = CatalogsParseFromXml(&pEngineState->catalogs, pixeBundle);
137 ExitOnFailure(hr, "Failed to parse catalog files.");
138
139 // parse registration 135 // parse registration
140 hr = RegistrationParseFromXml(&pEngineState->registration, pixeBundle); 136 hr = RegistrationParseFromXml(&pEngineState->registration, pixeBundle);
141 ExitOnFailure(hr, "Failed to parse registration."); 137 ExitOnFailure(hr, "Failed to parse registration.");
@@ -149,7 +145,7 @@ static HRESULT ParseFromXml(
149 ExitOnFailure(hr, "Failed to parse containers."); 145 ExitOnFailure(hr, "Failed to parse containers.");
150 146
151 // parse payloads 147 // parse payloads
152 hr = PayloadsParseFromXml(&pEngineState->payloads, &pEngineState->containers, &pEngineState->catalogs, pixeBundle); 148 hr = PayloadsParseFromXml(&pEngineState->payloads, &pEngineState->containers, pixeBundle);
153 ExitOnFailure(hr, "Failed to parse payloads."); 149 ExitOnFailure(hr, "Failed to parse payloads.");
154 150
155 // parse packages 151 // parse packages