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

Commit 6194c02c authored by Matthew Maurer's avatar Matthew Maurer Committed by android-build-merger
Browse files

Merge "Allow INVALID_INPUT_LENGTH for oversized messages" 

am: b397fc8e

Change-Id: Ia3e4641b9fa4936655da6db1d8def5f31cee6e06
parents 2140f5c7 b397fc8e

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2269,7 +2269,8 @@ TEST_F(EncryptionOperationsTest, RsaOaepTooLarge) { 
              Begin(KeyPurpose::ENCRYPT,

                    AuthorizationSetBuilder().Padding(PaddingMode::RSA_OAEP).Digest(Digest::SHA_2_256)));

    string result;

    EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, Finish(message, &result));

    auto error = Finish(message, &result);

    EXPECT_TRUE(error == ErrorCode::INVALID_INPUT_LENGTH || error == ErrorCode::INVALID_ARGUMENT);

    EXPECT_EQ(0U, result.size());

}
@@ -2327,7 +2328,8 @@ TEST_F(EncryptionOperationsTest, RsaPkcs1TooLarge) { 
    auto params = AuthorizationSetBuilder().Padding(PaddingMode::RSA_PKCS1_1_5_ENCRYPT);

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

    string result;

    EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, Finish(message, &result));

    auto error = Finish(message, &result);

    EXPECT_TRUE(error == ErrorCode::INVALID_INPUT_LENGTH || error == ErrorCode::INVALID_ARGUMENT);

    EXPECT_EQ(0U, result.size());

}