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

Commit bc970b08 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Purge unsupported RSA key sizes from VTS tests" into oc-dev

parents d8e99f75 39daaa0f

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ typedef KeymasterHidlTest GetKeyCharacteristicsTest; 
 */

TEST_F(GetKeyCharacteristicsTest, SimpleRsa) {

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

                                             .RsaSigningKey(256, 3)

                                             .RsaSigningKey(1024, 3)

                                             .Digest(Digest::NONE)

                                             .Padding(PaddingMode::NONE)));
@@ -2201,7 +2201,7 @@ typedef KeymasterHidlTest ExportKeyTest; 
 */

TEST_F(ExportKeyTest, RsaUnsupportedKeyFormat) {

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

                                             .RsaSigningKey(256, 3)

                                             .RsaSigningKey(1024, 3)

                                             .Digest(Digest::NONE)

                                             .Padding(PaddingMode::NONE)));

    HidlBuf export_data;
@@ -2218,7 +2218,7 @@ TEST_F(ExportKeyTest, RsaUnsupportedKeyFormat) { 
TEST_F(ExportKeyTest, DISABLED_RsaCorruptedKeyBlob) {

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

                                             .Authorization(TAG_NO_AUTH_REQUIRED)

                                             .RsaSigningKey(256, 3)

                                             .RsaSigningKey(1024, 3)

                                             .Digest(Digest::NONE)

                                             .Padding(PaddingMode::NONE)));

    for (size_t i = 0; i < key_blob_.size(); ++i) {