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

Commit 9193bd3e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add TAG_MAC_LENGTH to EncryptionOperationsTest.AesWrongPurpose" am:... 

Merge "Add TAG_MAC_LENGTH to EncryptionOperationsTest.AesWrongPurpose" am: a4bffdbe am: 336af578 am: c4b764ca

Change-Id: I2847afc7dffa74a30f99a73042c7a07bd768188b
parents c3be1d30 c4b764ca

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+8 −4
Original line number Diff line number Diff line
@@ -2607,8 +2607,10 @@ TEST_P(EncryptionOperationsTest, AesWrongPurpose) { 
                                   .Padding(PaddingMode::NONE));

    ASSERT_EQ(ErrorCode::OK, err) << "Got " << err;



    err = Begin(KeyPurpose::DECRYPT,

                AuthorizationSetBuilder().BlockMode(BlockMode::GCM).Padding(PaddingMode::NONE));

    err = Begin(KeyPurpose::DECRYPT, AuthorizationSetBuilder()

                                             .BlockMode(BlockMode::GCM)

                                             .Padding(PaddingMode::NONE)

                                             .Authorization(TAG_MAC_LENGTH, 128));

    EXPECT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, err) << "Got " << err;



    CheckedDeleteKey();
@@ -2621,8 +2623,10 @@ TEST_P(EncryptionOperationsTest, AesWrongPurpose) { 
                                                 .Authorization(TAG_MIN_MAC_LENGTH, 128)

                                                 .Padding(PaddingMode::NONE)));



    err = Begin(KeyPurpose::ENCRYPT,

                AuthorizationSetBuilder().BlockMode(BlockMode::GCM).Padding(PaddingMode::NONE));

    err = Begin(KeyPurpose::ENCRYPT, AuthorizationSetBuilder()

                                             .BlockMode(BlockMode::GCM)

                                             .Padding(PaddingMode::NONE)

                                             .Authorization(TAG_MAC_LENGTH, 128));

    EXPECT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, err) << "Got " << err;

}