tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Test the format of patch level device info

Browse source 
On top of checking that the patch level are a UINT, also check that they
follow the YYYYMM or YYYYMMDD format in the CSR v3 as is required by the
server validation logic. This check is not applied in the factory as the
value might not yet be correctly provisioned.

Bug: 269813991
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I5c62ba176dae390ea0a387bba6cb975226e3873a
This commit is contained in:
Andrew Scull 2023-08-31 19:28:36 +00:00
parent d284817690
commit e780dbf0d0
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
security/keymint/support/remote_prov_utils.cpp
View file

@ -14,6 +14,7 @@
* limitations under the License.
*/
#include <iomanip>
#include <iterator>
#include <memory>
#include <set>
@ -420,6 +421,36 @@ std::string checkMapEntry(bool isFactory, const cppbor::Map& devInfo, cppbor::Ma
return entryName + " has an invalid value.\n";
}
std::string checkMapPatchLevelEntry(bool isFactory, const cppbor::Map& devInfo,
const std::string& entryName) {
std::string error = checkMapEntry(isFactory, devInfo, cppbor::UINT, entryName);
if (!error.empty()) {
return error;
}
if (isFactory) {
return "";
}
const std::unique_ptr<cppbor::Item>& val = devInfo.get(entryName);
std::string dateString = std::to_string(val->asUint()->unsignedValue());
if (dateString.size() == 6) {
dateString += "01";
}
if (dateString.size() != 8) {
return entryName + " should in the format YYYYMMDD or YYYYMM\n";
}
std::tm t;
std::istringstream ss(dateString);
ss >> std::get_time(&t, "%Y%m%d");
if (!ss) {
return entryName + " should in the format YYYYMMDD or YYYYMM\n";
}
return "";
}
bool isTeeDeviceInfo(const cppbor::Map& devInfo) {
return devInfo.get("security_level") && devInfo.get("security_level")->asTstr() &&
devInfo.get("security_level")->asTstr()->value() == "tee";
@ -520,6 +551,10 @@ ErrMsgOr<std::unique_ptr<cppbor::Map>> parseAndValidateDeviceInfo(
error += "Err: Unrecognized key entry: <" + key->asTstr()->value() + ">,\n";
}
}
// Checks that only apply to v3.
error += checkMapPatchLevelEntry(isFactory, *parsed, "system_patch_level");
error += checkMapPatchLevelEntry(isFactory, *parsed, "boot_patch_level");
error += checkMapPatchLevelEntry(isFactory, *parsed, "vendor_patch_level");
FALLTHROUGH_INTENDED;
case 2:
for (const auto& entry : kAttestationIdEntrySet) {