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

Commit bc25041f authored by Shawn Willden's avatar Shawn Willden Committed by android-build-merger
Browse files

Merge "Add missing application ID tag to AES/HMAC attestation calls" into oc-dev 

am: 585acc67

Change-Id: I613bc59b8eeeed229131fcff32835e91d26adda6
parents 43266a76 585acc67

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+27 −19
Original line number Diff line number Diff line
@@ -3932,16 +3932,20 @@ TEST_F(AttestationTest, EcAttestationRequiresAttestationAppId) { 
 * Verifies that attesting to AES keys fails in the expected way.

 */

TEST_F(AttestationTest, AesAttestation) {

    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

    ASSERT_EQ(ErrorCode::OK,

              GenerateKey(AuthorizationSetBuilder()

                              .Authorization(TAG_NO_AUTH_REQUIRED)

                              .AesEncryptionKey(128)

                              .EcbMode()

                              .Padding(PaddingMode::PKCS7)));



    hidl_vec<hidl_vec<uint8_t>> cert_chain;

    EXPECT_EQ(ErrorCode::INCOMPATIBLE_ALGORITHM,

              AttestKey(AuthorizationSetBuilder().Authorization(TAG_ATTESTATION_CHALLENGE,

                                                                HidlBuf("challenge")),

    EXPECT_EQ(

        ErrorCode::INCOMPATIBLE_ALGORITHM,

        AttestKey(

            AuthorizationSetBuilder()

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

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

            &cert_chain));

}
@@ -3951,7 +3955,8 @@ TEST_F(AttestationTest, AesAttestation) { 
 * Verifies that attesting to HMAC keys fails in the expected way.

 */

TEST_F(AttestationTest, HmacAttestation) {

    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

    ASSERT_EQ(ErrorCode::OK,

              GenerateKey(AuthorizationSetBuilder()

                              .Authorization(TAG_NO_AUTH_REQUIRED)

                              .HmacKey(128)

                              .EcbMode()
@@ -3959,9 +3964,12 @@ TEST_F(AttestationTest, HmacAttestation) { 
                              .Authorization(TAG_MIN_MAC_LENGTH, 128)));



    hidl_vec<hidl_vec<uint8_t>> cert_chain;

    EXPECT_EQ(ErrorCode::INCOMPATIBLE_ALGORITHM,

              AttestKey(AuthorizationSetBuilder().Authorization(TAG_ATTESTATION_CHALLENGE,

                                                                HidlBuf("challenge")),

    EXPECT_EQ(

        ErrorCode::INCOMPATIBLE_ALGORITHM,

        AttestKey(

            AuthorizationSetBuilder()

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

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

            &cert_chain));

}