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

Commit 1235d348 authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Relax finish result on RSA operations 

Some RSA operation tests expect ErrorCode::INVALID_ARGUMENT
and others ErrorCode::INVALID_INPUT_LENGTH for the same
diagnosed syndrome, i.e., the input message was too long.

This patch relaxes the expectations on one of these tests
expecting ErrorCode::INVALID_INPUT_LENGTH, to also accept the
more consistent ErrorCode::INVALID_ARGUMENT.

Bug: 67358942
Bug: 67359132
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I573d3a01b052f0256611064f23ae791007cf7122
parent 6a6a71cf

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1565,7 +1565,9 @@ TEST_F(SigningOperationsTest, RsaNoPaddingTooLong) { 
                                          .Digest(Digest::NONE)

                                          .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN)));

    string result;

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

    ErrorCode finish_error_code = Finish(message, &result);

    EXPECT_TRUE(finish_error_code == ErrorCode::INVALID_INPUT_LENGTH ||

                finish_error_code == ErrorCode::INVALID_ARGUMENT);



    // Very large message that should exceed the transfer buffer size of any reasonable TEE.

    message = string(128 * 1024, 'a');
@@ -1573,7 +1575,9 @@ TEST_F(SigningOperationsTest, RsaNoPaddingTooLong) { 
              Begin(KeyPurpose::SIGN, AuthorizationSetBuilder()

                                          .Digest(Digest::NONE)

                                          .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN)));

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

    finish_error_code = Finish(message, &result);

    EXPECT_TRUE(finish_error_code == ErrorCode::INVALID_INPUT_LENGTH ||

                finish_error_code == ErrorCode::INVALID_ARGUMENT);

}



/*