Merge "Add VSR annotations for RKP DICE" am: 5fc0168163 am: 68af3d71f8

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2568770

Change-Id: I91104c3700e88a037f22be6ba88148cebbad8b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Seth Moore
2023-04-28 00:07:59 +00:00
committed by Automerger Merge Worker

View File

@@ -702,6 +702,7 @@ class CertificateRequestV2Test : public CertificateRequestTestBase {
* Generate an empty certificate request with all possible length of challenge, and decrypt and
* verify the structure and content.
*/
// @VsrTest = 3.10-015
TEST_P(CertificateRequestV2Test, EmptyRequest) {
bytevec csr;
@@ -721,6 +722,7 @@ TEST_P(CertificateRequestV2Test, EmptyRequest) {
* Generate a non-empty certificate request with all possible length of challenge. Decrypt, parse
* and validate the contents.
*/
// @VsrTest = 3.10-015
TEST_P(CertificateRequestV2Test, NonEmptyRequest) {
generateKeys(false /* testMode */, 1 /* numKeys */);
@@ -753,6 +755,7 @@ TEST_P(CertificateRequestV2Test, EmptyRequestWithInvalidChallengeFail) {
* Generate a non-empty certificate request. Make sure contents are reproducible but allow for the
* signature to be different since algorithms including ECDSA P-256 can include a random value.
*/
// @VsrTest = 3.10-015
TEST_P(CertificateRequestV2Test, NonEmptyRequestReproducible) {
generateKeys(false /* testMode */, 1 /* numKeys */);
@@ -776,6 +779,7 @@ TEST_P(CertificateRequestV2Test, NonEmptyRequestReproducible) {
/**
* Generate a non-empty certificate request with multiple keys.
*/
// @VsrTest = 3.10-015
TEST_P(CertificateRequestV2Test, NonEmptyRequestMultipleKeys) {
generateKeys(false /* testMode */, rpcHardwareInfo.supportedNumKeysInCsr /* numKeys */);
@@ -849,6 +853,7 @@ void parse_root_of_trust(const vector<uint8_t>& attestation_cert,
/**
* Generate a CSR and verify DeviceInfo against IDs attested by KeyMint.
*/
// @VsrTest = 3.10-015
TEST_P(CertificateRequestV2Test, DeviceInfo) {
// See if there is a matching IKeyMintDevice for this IRemotelyProvisionedComponent.
std::shared_ptr<IKeyMintDevice> keyMint;