mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-12 22:26:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix a version issue in ACBPv2 definition file

Browse source
This commit is contained in:
Nikolaj Schlej 2022-09-10 16:08:06 +02:00
parent a9c6f347a2
commit c4ca232b3a
3 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/fitparser.cpp
View file

@ -278,12 +278,10 @@ USTATUS FitParser::parseFitEntryMicrocode(const UByteArray & microcode, const UI
USTATUS FitParser::parseFitEntryAcm(const UByteArray & acm, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize)
{
// Parse Intel ACM using Kaitai-generated parser
// TODO: need to do something with the copy here, probably implement a custom wrapper
std::istringstream is(std::string(acm.constData(), acm.size()));
is.seekg(localOffset, is.beg);
kaitai::kstream ks(&is);
try {
std::istringstream is(std::string(acm.constData(), acm.size()));
is.seekg(localOffset, is.beg);
kaitai::kstream ks(&is);
intel_acm_t parsed(&ks);
intel_acm_t::header_t* header = parsed.header();
@ -396,11 +394,9 @@ USTATUS FitParser::parseFitEntryBootGuardKeyManifest(const UByteArray & keyManif
{
U_UNUSED_PARAMETER(realSize);
// TODO: need to do something with the copy here, probably implement a custom wrapper
std::istringstream is(std::string(keyManifest.constData(), keyManifest.size()));
// v1
try {
std::istringstream is(std::string(keyManifest.constData(), keyManifest.size()));
is.seekg(localOffset, is.beg);
kaitai::kstream ks(&is);
intel_keym_v1_t parsed(&ks);
@ -469,6 +465,7 @@ USTATUS FitParser::parseFitEntryBootGuardKeyManifest(const UByteArray & keyManif
// v2
try {
std::istringstream is(std::string(keyManifest.constData(), keyManifest.size()));
is.seekg(localOffset, is.beg);
kaitai::kstream ks(&is);
intel_keym_v2_t parsed(&ks);
@ -564,11 +561,9 @@ USTATUS FitParser::parseFitEntryBootGuardBootPolicy(const UByteArray & bootPolic
{
U_UNUSED_PARAMETER(realSize);
// TODO: need to do something with the copy here, probably implement a custom wrapper
std::istringstream is(std::string(bootPolicy.constData(), bootPolicy.size()));
// v1
try {
std::istringstream is(std::string(bootPolicy.constData(), bootPolicy.size()));
is.seekg(localOffset, is.beg);
kaitai::kstream ks(&is);
intel_acbp_v1_t parsed(&ks);
@ -826,6 +821,7 @@ USTATUS FitParser::parseFitEntryBootGuardBootPolicy(const UByteArray & bootPolic
// v2
try {
std::istringstream is(std::string(bootPolicy.constData(), bootPolicy.size()));
is.seekg(localOffset, is.beg);
kaitai::kstream ks(&is);
intel_acbp_v2_t parsed(&ks); // This already verified the version to be >= 0x20