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

Commit 1501f29b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6 am: 9f423942 

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

Change-Id: Ib1bfb1aecf349347ca08c82a92260692fee49f32
parents fb76d536 9f423942

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

+5 −5
Original line number Diff line number Diff line
@@ -3329,7 +3329,7 @@ TEST_P(ImportKeyTest, TripleDesSuccess) { 
 */

TEST_P(ImportKeyTest, TripleDesFailure) {

    string key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358");

    uint32_t bitlen = key.size() * 8;

    uint32_t bitlen = key.size() * 7;

    for (uint32_t key_size : {bitlen - 1, bitlen + 1, bitlen - 8, bitlen + 8}) {

        // Explicit key size doesn't match that of the provided key.

        auto result = ImportKey(AuthorizationSetBuilder()
@@ -3343,19 +3343,19 @@ TEST_P(ImportKeyTest, TripleDesFailure) { 
                << "unexpected result: " << result;

    }

    // Explicit key size matches that of the provided key, but it's not a valid size.

    string long_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358");

    string long_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f735800");

    ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,

              ImportKey(AuthorizationSetBuilder()

                                .Authorization(TAG_NO_AUTH_REQUIRED)

                                .TripleDesEncryptionKey(long_key.size() * 8)

                                .TripleDesEncryptionKey(long_key.size() * 7)

                                .EcbMode()

                                .Padding(PaddingMode::PKCS7),

                        KeyFormat::RAW, long_key));

    string short_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358");

    string short_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f73");

    ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,

              ImportKey(AuthorizationSetBuilder()

                                .Authorization(TAG_NO_AUTH_REQUIRED)

                                .TripleDesEncryptionKey(short_key.size() * 8)

                                .TripleDesEncryptionKey(short_key.size() * 7)

                                .EcbMode()

                                .Padding(PaddingMode::PKCS7),

                        KeyFormat::RAW, short_key));