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

Commit ee48d481 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8298157 from 5bcf2a42 to tm-d1-release 

Change-Id: I55673ff9895ac0832713b353d07ef9a0819b3d47
parents 92893c09 5bcf2a42

keymaster/3.0/vts/OWNERS

+1 −0
Original line number Diff line number Diff line 
drysdale@google.com

jdanis@google.com

swillden@google.com

yim@google.com

keymaster/4.0/vts/OWNERS

+1 −0
Original line number Diff line number Diff line 
drysdale@google.com

jbires@google.com

jdanis@google.com

swillden@google.com

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');

keymaster/4.1/vts/OWNERS

+1 −0
Original line number Diff line number Diff line 
drysdale@google.com

jbires@google.com

jdanis@google.com

swillden@google.com

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');