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

Commit 244ec00b authored by Janis Danisevskis's avatar Janis Danisevskis Committed by android-build-merger
Browse files

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

am: eb5a6056

Change-Id: Ie818759949e967cef8b5da599cce004e42dbd837
parents 478eea97 eb5a6056

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1373,7 +1373,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)));
@@ -2245,7 +2245,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;
@@ -2262,7 +2262,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) {