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

Commit 52cc2fcd authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "More error codes for device unique attestation" into main am: e3860304 

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



Change-Id: I3b9b019d4a6f03a325d854517e0e757248d87bbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d99059a3 e3860304

keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp

+8 −8
Original line number Diff line number Diff line
@@ -229,13 +229,13 @@ TEST_P(DeviceUniqueAttestationTest, NonStrongBoxOnly) { 
                                                         .Authorization(TAG_INCLUDE_UNIQUE_ID))));



    hidl_vec<hidl_vec<uint8_t>> cert_chain;

    EXPECT_EQ(ErrorCode::UNIMPLEMENTED,

              convert(AttestKey(

                      AuthorizationSetBuilder()

    ErrorCode result = convert(

            AttestKey(AuthorizationSetBuilder()

                              .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION)

                              .Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge"))

                              .Authorization(TAG_ATTESTATION_APPLICATION_ID, HidlBuf("foo")),

                      &cert_chain)));

                      &cert_chain));

    EXPECT_TRUE(result == ErrorCode::UNIMPLEMENTED || result == ErrorCode::INVALID_ARGUMENT);

    CheckedDeleteKey();



    ASSERT_EQ(ErrorCode::OK, convert(GenerateKey(AuthorizationSetBuilder()
@@ -244,13 +244,13 @@ TEST_P(DeviceUniqueAttestationTest, NonStrongBoxOnly) { 
                                                         .Digest(Digest::SHA_2_256)

                                                         .Authorization(TAG_INCLUDE_UNIQUE_ID))));



    EXPECT_EQ(ErrorCode::UNIMPLEMENTED,

              convert(AttestKey(

                      AuthorizationSetBuilder()

    result = convert(

            AttestKey(AuthorizationSetBuilder()

                              .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION)

                              .Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge"))

                              .Authorization(TAG_ATTESTATION_APPLICATION_ID, HidlBuf("foo")),

                      &cert_chain)));

                      &cert_chain));

    EXPECT_TRUE(result == ErrorCode::UNIMPLEMENTED || result == ErrorCode::INVALID_ARGUMENT);

    CheckedDeleteKey();

}