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

Commit 2c19304e authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Fix AES corrupt padding test" am: b474607b am: b661792d am: 2e449950 

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



Change-Id: I1a4bf228d73452cbc718ab126165bf09e0cdf833
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8431b21a 2e449950

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2866,8 +2866,8 @@ TEST_P(EncryptionOperationsTest, AesEcbPkcs7PaddingCorrupted) { 


        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        string plaintext;

        ErrorCode error = Finish(message, &plaintext);

        if (error == ErrorCode::INVALID_INPUT_LENGTH) {

        ErrorCode error = Finish(ciphertext, &plaintext);

        if (error == ErrorCode::INVALID_ARGUMENT) {

            // This is the expected error, we can exit the test now.

            return;

        } else {

security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ interface IKeyMintOperation { 
     *   not a multiple of the AES block size, finish() must return

     *   ErrorCode::INVALID_INPUT_LENGTH.  If padding is PaddingMode::PKCS7, pad the data per the

     *   PKCS#7 specification, including adding an additional padding block if the data is a

     *   multiple of the block length.

     *   multiple of the block length.  If padding is PaddingMode::PKCS7 and decryption does not

     *   result in valid padding, return ErrorCode::INVALID_ARGUMENT.

     *

     * o BlockMode::GCM.  During encryption, after processing all plaintext, compute the tag

     *   (Tag::MAC_LENGTH bytes) and append it to the returned ciphertext.  During decryption,

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

+30 −3
Original line number Diff line number Diff line
@@ -5481,18 +5481,45 @@ TEST_P(EncryptionOperationsTest, AesEcbPkcs7PaddingCorrupted) { 


        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        string plaintext;

        ErrorCode error = Finish(message, &plaintext);

        if (error == ErrorCode::INVALID_INPUT_LENGTH) {

        ErrorCode error = Finish(ciphertext, &plaintext);

        if (error == ErrorCode::INVALID_ARGUMENT) {

            // This is the expected error, we can exit the test now.

            return;

        } else {

            // Very small chance we got valid decryption, so try again.

            ASSERT_EQ(error, ErrorCode::OK);

            ASSERT_EQ(error, ErrorCode::OK)

                    << "Expected INVALID_ARGUMENT or (rarely) OK, got " << error;

        }

    }

    FAIL() << "Corrupt ciphertext should have failed to decrypt by now.";

}



/*

 * EncryptionOperationsTest.AesEcbPkcs7CiphertextTooShort

 *

 * Verifies that AES decryption fails in the correct way when the padding is corrupted.

 */

TEST_P(EncryptionOperationsTest, AesEcbPkcs7CiphertextTooShort) {

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

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)

                                                 .AesEncryptionKey(128)

                                                 .Authorization(TAG_BLOCK_MODE, BlockMode::ECB)

                                                 .Padding(PaddingMode::PKCS7)));



    auto params = AuthorizationSetBuilder().BlockMode(BlockMode::ECB).Padding(PaddingMode::PKCS7);



    string message = "a";

    string ciphertext = EncryptMessage(message, params);

    EXPECT_EQ(16U, ciphertext.size());

    EXPECT_NE(ciphertext, message);



    // Shorten the ciphertext.

    ciphertext.resize(ciphertext.size() - 1);

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

    string plaintext;

    EXPECT_EQ(ErrorCode::INVALID_INPUT_LENGTH, Finish(ciphertext, &plaintext));

}



vector<uint8_t> CopyIv(const AuthorizationSet& set) {

    auto iv = set.GetTagValue(TAG_NONCE);

    EXPECT_TRUE(iv);