jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-21 23:48:22 +08:00
Code Issues Projects Releases Wiki Activity

Split up the signature exponent and modulus on stdout

Browse Source 
This makes it easier to parse from Python.
This commit is contained in:
Richard Hughes 2022-10-10 12:03:11 +01:00 committed by Nikolaj Schlej
parent c3cedba150
commit cd22c3db2b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/fitparser.cpp
View File

@ -400,11 +400,12 @@ USTATUS FitParser::parseFitEntryAcm(const UByteArray & acm, const UINT32 localOf
// Add RsaPublicKey // Add RsaPublicKey
if (header->_is_null_rsa_exponent() == false) { if (header->_is_null_rsa_exponent() == false) {
acmInfo += usprintf("ACM RSA Public Key (Exponent: %Xh):", header->rsa_exponent()); acmInfo += usprintf("ACM RSA Public Key Exponent: %Xh\n", header->rsa_exponent());
} }
else { else {
acmInfo += usprintf("ACM RSA Public Key (Exponent: %Xh):", INTEL_ACM_HARDCODED_RSA_EXPONENT); acmInfo += usprintf("ACM RSA Public Key Exponent: %Xh\n", INTEL_ACM_HARDCODED_RSA_EXPONENT);
} }
acmInfo += usprintf("ACM RSA Public Key: ");
for (UINT32 i = 0; i < header->rsa_public_key().size(); i++) { for (UINT32 i = 0; i < header->rsa_public_key().size(); i++) {
if (i % 32 == 0) acmInfo += "\n"; if (i % 32 == 0) acmInfo += "\n";
acmInfo += usprintf("%02X", (UINT8)header->rsa_public_key().at(i)); acmInfo += usprintf("%02X", (UINT8)header->rsa_public_key().at(i));
@ -479,7 +480,8 @@ USTATUS FitParser::parseFitEntryBootGuardKeyManifest(const UByteArray & keyManif
key_signature->sig_scheme()); key_signature->sig_scheme());
// Add PubKey // Add PubKey
kmInfo += usprintf("Key Manifest Public Key (Exponent: %Xh): ", key_signature->public_key()->exponent()); kmInfo += usprintf("Key Manifest Public Key Exponent: %Xh\n", key_signature->public_key()->exponent());
kmInfo += usprintf("Key Manifest Public Key :");
for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) { for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) {
if (i % 32 == 0) kmInfo += UString("\n"); if (i % 32 == 0) kmInfo += UString("\n");
kmInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i)); kmInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i));
@ -587,7 +589,8 @@ USTATUS FitParser::parseFitEntryBootGuardKeyManifest(const UByteArray & keyManif
key_signature->sig_scheme()); key_signature->sig_scheme());
// Add PubKey // Add PubKey
kmInfo += usprintf("Key Manifest Public Key (Exponent: %Xh): ", key_signature->public_key()->exponent()); kmInfo += usprintf("Key Manifest Public Key Exponent: %Xh\n", key_signature->public_key()->exponent());
kmInfo += usprintf("Key Manifest Public Key: ");
for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) { for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) {
if (i % 32 == 0) kmInfo += UString("\n"); if (i % 32 == 0) kmInfo += UString("\n");
kmInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i)); kmInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i));
@ -846,7 +849,8 @@ USTATUS FitParser::parseFitEntryBootGuardBootPolicy(const UByteArray & bootPolic
key_signature->sig_scheme()); key_signature->sig_scheme());
// Add PubKey // Add PubKey
bpInfo += usprintf("Boot Policy Public Key (Exponent: %Xh): ", key_signature->public_key()->exponent()); bpInfo += usprintf("Boot Policy Public Key Exponent: %Xh\n", key_signature->public_key()->exponent());
bpInfo += usprintf("Boot Policy Public Key: ");
for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) { for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) {
if (i % 32 == 0) bpInfo += UString("\n"); if (i % 32 == 0) bpInfo += UString("\n");
bpInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i)); bpInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i));
@ -1137,7 +1141,8 @@ USTATUS FitParser::parseFitEntryBootGuardBootPolicy(const UByteArray & bootPolic
key_signature->sig_scheme()); key_signature->sig_scheme());
// Add PubKey // Add PubKey
bpInfo += usprintf("Boot Policy Public Key (Exponent: %Xh): ", key_signature->public_key()->exponent()); bpInfo += usprintf("Boot Policy Public Key Exponent: %Xh\n", key_signature->public_key()->exponent());
bpInfo += usprintf("Boot Policy Public Key: ");
for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) { for (UINT16 i = 0; i < (UINT16)key_signature->public_key()->modulus().length(); i++) {
if (i % 32 == 0) bpInfo += UString("\n"); if (i % 32 == 0) bpInfo += UString("\n");
bpInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i)); bpInfo += usprintf("%02X", (UINT8)key_signature->public_key()->modulus().at(i));