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

Commit 523b300d authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Key{Mint,Master} VTS: fix incremental AES tags" am: e5c2bf01 

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

Change-Id: Id6eaa7257486031e6b7cc36dc81cf85fbdf83e51
parents a91e17ed e5c2bf01

keymaster/4.0/vts/functional/KeymasterHidlTest.cpp

+9 −6
Original line number Diff line number Diff line
@@ -445,12 +445,15 @@ string KeymasterHidlTest::MacMessage(const string& message, Digest digest, size_ 


void KeymasterHidlTest::CheckAesIncrementalEncryptOperation(BlockMode block_mode,

                                                            int message_size) {

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

    auto builder = AuthorizationSetBuilder()

                           .Authorization(TAG_NO_AUTH_REQUIRED)

                           .AesEncryptionKey(128)

                           .BlockMode(block_mode)

                                                 .Padding(PaddingMode::NONE)

                                                 .Authorization(TAG_MIN_MAC_LENGTH, 128)));

                           .Padding(PaddingMode::NONE);

    if (block_mode == BlockMode::GCM) {

        builder.Authorization(TAG_MIN_MAC_LENGTH, 128);

    }

    ASSERT_EQ(ErrorCode::OK, GenerateKey(builder));



    for (int increment = 1; increment <= message_size; ++increment) {

        string message(message_size, 'a');

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+9 −6
Original line number Diff line number Diff line
@@ -667,12 +667,15 @@ string KeyMintAidlTestBase::MacMessage(const string& message, Digest digest, siz 


void KeyMintAidlTestBase::CheckAesIncrementalEncryptOperation(BlockMode block_mode,

                                                              int message_size) {

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

    auto builder = AuthorizationSetBuilder()

                           .Authorization(TAG_NO_AUTH_REQUIRED)

                           .AesEncryptionKey(128)

                           .BlockMode(block_mode)

                                                 .Padding(PaddingMode::NONE)

                                                 .Authorization(TAG_MIN_MAC_LENGTH, 128)));

                           .Padding(PaddingMode::NONE);

    if (block_mode == BlockMode::GCM) {

        builder.Authorization(TAG_MIN_MAC_LENGTH, 128);

    }

    ASSERT_EQ(ErrorCode::OK, GenerateKey(builder));



    for (int increment = 1; increment <= message_size; ++increment) {

        string message(message_size, 'a');