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

Commit f9fceff6 authored by Iris Chang's avatar Iris Chang Committed by android-build-merger
Browse files

Merge "Fix Keymaster VTS for OpenSSL error code change" 

am: fc233569

Change-Id: If832fc5e82618c394fd253215cd5c8e5e0011e39
parents cf105b67 fc233569

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

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

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

    string result;

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

    auto error = Finish(message, &result);

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

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

}
@@ -2820,7 +2821,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_INPUT_LENGTH, Finish(message, &result));

    auto error = Finish(message, &result);

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

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

}