From 39daaa0f96b248539c28f62e6a245798abb45d1b Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Tue, 6 Jun 2017 10:11:07 -0700 Subject: [PATCH] Purge unsupported RSA key sizes from VTS tests Support for 256 bit RSA keys are not mandated by keymaster specs and must not be used in the VTS tests. Bug: 62581389 Change-Id: If315088db2752ac2efe31fdb95db7ca13c3ce225 --- keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp index 54c5ad571e..0c888dc361 100644 --- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp @@ -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) {