From 33e2d0113c1e8da1a13cd532ee5e903865e4e6c5 Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Thu, 27 Apr 2023 21:00:48 +0000 Subject: [PATCH] Add VSR annotations for RKP DICE Bug: 277965670 Test: n/a (comment changes only) (cherry picked from https://android-review.googlesource.com/q/commit:ac1639f227f7edb1ce284adc2a4f48f88d347da1) Merged-In: I64e34c1f9865811f0967148cad914f7ef77f9448 Change-Id: I64e34c1f9865811f0967148cad914f7ef77f9448 --- .../vts/functional/VtsRemotelyProvisionedComponentTests.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp index 8906543e7f..62463ebc7b 100644 --- a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp +++ b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp @@ -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& 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 keyMint;