Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f05ff907 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Add VSR annotations for RKP DICE" am: 5fc01681 am: 68af3d71 am:... 

Merge "Add VSR annotations for RKP DICE" am: 5fc01681 am: 68af3d71 am: 802a4564 am: 82c8f1f8

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



Change-Id: Ife2cab11cb5a3dcb98ccfde2d0980f62edc8b34c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5ab6e49 82c8f1f8

security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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;