mirrors/stenc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect radix printing (#78)

Browse Source
This commit is contained in:
James Wilson
2022-05-19 00:08:51 -07:00
committed by GitHub
parent d2b7363769
commit 490251f101
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.cpp
View File

@@ -94,7 +94,7 @@ static void print_algorithm_name(std::ostream& os, const uint32_t code)
// Reference: SFSC / INCITS 501-2016
if (0x80010400 <= code && code <= 0x8001FFFF) {
os << "Vendor specific 0x" << std::setw(8) << std::setfill('0') << std::hex
<< code;
<< code << std::setfill(' ');
}
switch (code) {
case 0x0001000C:
@@ -110,7 +110,8 @@ static void print_algorithm_name(std::ostream& os, const uint32_t code)
os << "AES-256-XTS-HMAC-SHA-512";
break;
default:
os << "Unknown 0x" << std::setw(8) << std::setfill('0') << std::hex << code;
os << "Unknown 0x" << std::setw(8) << std::setfill('0') << std::hex << code
<< std::setfill(' ');
}
}
@@ -145,7 +146,7 @@ static void print_algorithms(std::ostream& os, const scsi::page_dec& page)
} else {
os << "maximum ";
}
os << ntohs(ad.maximum_ukad_length) << " bytes\n";
os << std::dec << ntohs(ad.maximum_ukad_length) << " bytes\n";
}
// Print raw decryption mode capability:
@@ -275,7 +276,7 @@ static void print_device_status(std::ostream& os, const scsi::page_des& opt,
os << std::setw(25) << "Key Instance Counter:" << std::dec
<< ntohl(opt.key_instance_counter) << "\n";
if (opt.algorithm_index != 0) {
os << std::setw(25) << "Encryption Algorithm:" << std::hex
os << std::setw(25) << "Encryption Algorithm:" << std::dec
<< static_cast<unsigned int>(opt.algorithm_index) << "\n";
}
}