diff options
Diffstat (limited to 'src/engine/payload.cpp')
| -rw-r--r-- | src/engine/payload.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
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( | |||
| 18 | extern "C" HRESULT PayloadsParseFromXml( | 18 | extern "C" HRESULT PayloadsParseFromXml( |
| 19 | __in BURN_PAYLOADS* pPayloads, | 19 | __in BURN_PAYLOADS* pPayloads, |
| 20 | __in_opt BURN_CONTAINERS* pContainers, | 20 | __in_opt BURN_CONTAINERS* pContainers, |
| 21 | __in_opt BURN_CATALOGS* pCatalogs, | ||
| 22 | __in IXMLDOMNode* pixnBundle | 21 | __in IXMLDOMNode* pixnBundle |
| 23 | ) | 22 | ) |
| 24 | { | 23 | { |
| @@ -130,26 +129,6 @@ extern "C" HRESULT PayloadsParseFromXml( | |||
| 130 | ExitOnFailure(hr, "Failed to parse @FileSize."); | 129 | ExitOnFailure(hr, "Failed to parse @FileSize."); |
| 131 | } | 130 | } |
| 132 | 131 | ||
| 133 | // @CertificateAuthorityKeyIdentifier | ||
| 134 | hr = XmlGetAttributeEx(pixnNode, L"CertificateRootPublicKeyIdentifier", &scz); | ||
| 135 | if (E_NOTFOUND != hr) | ||
| 136 | { | ||
| 137 | ExitOnFailure(hr, "Failed to get @CertificateRootPublicKeyIdentifier."); | ||
| 138 | |||
| 139 | hr = StrAllocHexDecode(scz, &pPayload->pbCertificateRootPublicKeyIdentifier, &pPayload->cbCertificateRootPublicKeyIdentifier); | ||
| 140 | ExitOnFailure(hr, "Failed to hex decode @CertificateRootPublicKeyIdentifier."); | ||
| 141 | } | ||
| 142 | |||
| 143 | // @CertificateThumbprint | ||
| 144 | hr = XmlGetAttributeEx(pixnNode, L"CertificateRootThumbprint", &scz); | ||
| 145 | if (E_NOTFOUND != hr) | ||
| 146 | { | ||
| 147 | ExitOnFailure(hr, "Failed to get @CertificateRootThumbprint."); | ||
| 148 | |||
| 149 | hr = StrAllocHexDecode(scz, &pPayload->pbCertificateRootThumbprint, &pPayload->cbCertificateRootThumbprint); | ||
| 150 | ExitOnFailure(hr, "Failed to hex decode @CertificateRootThumbprint."); | ||
| 151 | } | ||
| 152 | |||
| 153 | // @Hash | 132 | // @Hash |
| 154 | hr = XmlGetAttributeEx(pixnNode, L"Hash", &scz); | 133 | hr = XmlGetAttributeEx(pixnNode, L"Hash", &scz); |
| 155 | ExitOnFailure(hr, "Failed to get @Hash."); | 134 | ExitOnFailure(hr, "Failed to get @Hash."); |
| @@ -157,16 +136,6 @@ extern "C" HRESULT PayloadsParseFromXml( | |||
| 157 | hr = StrAllocHexDecode(scz, &pPayload->pbHash, &pPayload->cbHash); | 136 | hr = StrAllocHexDecode(scz, &pPayload->pbHash, &pPayload->cbHash); |
| 158 | ExitOnFailure(hr, "Failed to hex decode the Payload/@Hash."); | 137 | ExitOnFailure(hr, "Failed to hex decode the Payload/@Hash."); |
| 159 | 138 | ||
| 160 | // @Catalog | ||
| 161 | hr = XmlGetAttributeEx(pixnNode, L"Catalog", &scz); | ||
| 162 | if (E_NOTFOUND != hr) | ||
| 163 | { | ||
| 164 | ExitOnFailure(hr, "Failed to get @Catalog."); | ||
| 165 | |||
| 166 | hr = CatalogFindById(pCatalogs, scz, &pPayload->pCatalog); | ||
| 167 | ExitOnFailure(hr, "Failed to find catalog."); | ||
| 168 | } | ||
| 169 | |||
| 170 | // prepare next iteration | 139 | // prepare next iteration |
| 171 | ReleaseNullObject(pixnNode); | 140 | ReleaseNullObject(pixnNode); |
| 172 | } | 141 | } |
| @@ -194,8 +163,6 @@ extern "C" void PayloadsUninitialize( | |||
| 194 | ReleaseStr(pPayload->sczKey); | 163 | ReleaseStr(pPayload->sczKey); |
| 195 | ReleaseStr(pPayload->sczFilePath); | 164 | ReleaseStr(pPayload->sczFilePath); |
| 196 | ReleaseMem(pPayload->pbHash); | 165 | ReleaseMem(pPayload->pbHash); |
| 197 | ReleaseMem(pPayload->pbCertificateRootThumbprint); | ||
| 198 | ReleaseMem(pPayload->pbCertificateRootPublicKeyIdentifier); | ||
| 199 | ReleaseStr(pPayload->sczSourcePath); | 166 | ReleaseStr(pPayload->sczSourcePath); |
| 200 | ReleaseStr(pPayload->sczLocalFilePath); | 167 | ReleaseStr(pPayload->sczLocalFilePath); |
| 201 | ReleaseStr(pPayload->downloadSource.sczUrl); | 168 | ReleaseStr(pPayload->downloadSource.sczUrl); |
