Shift to KmVersion::KEYMINT_2
- Add KmVersion::KEYMINT_2 = 200 (i.e. 100*AIDL version).
- Use KEYMINT_2 as default version for AndroidKeyMintDevice.
- Keep the version number used for messages between HAL service and TA
at the same level (4), as no message format has changed (just a new
enum value).
- Change the attestation extension version number to 200, in both the
KeyMint version and the format version.
- Change the reported version number in {KeyMint,Rpc}HardwareInfo from
1 to 2.
Bug: 194358913
Test: VtsAidKeyMintTargetTest, TreeHugger
Change-Id: Id7f763a95865b72927f11c2c1348524655a6c683
diff --git a/ng/AndroidRemotelyProvisionedComponentDevice.cpp b/ng/AndroidRemotelyProvisionedComponentDevice.cpp
index ccd13d5..f33c631 100644
--- a/ng/AndroidRemotelyProvisionedComponentDevice.cpp
+++ b/ng/AndroidRemotelyProvisionedComponentDevice.cpp
@@ -83,7 +83,7 @@
}
ScopedAStatus AndroidRemotelyProvisionedComponentDevice::getHardwareInfo(RpcHardwareInfo* info) {
- info->versionNumber = 1;
+ info->versionNumber = 2;
info->rpcAuthorName = "Google";
info->supportedEekCurve = RpcHardwareInfo::CURVE_25519;
return ScopedAStatus::ok();