tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
TreeHugger Robot 2017-06-14 02:22:13 +00:00 committed by Android (Google) Code Review
commit bc970b089f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
View file

@ -1329,7 +1329,7 @@ typedef KeymasterHidlTest GetKeyCharacteristicsTest;
*/ */
TEST_F(GetKeyCharacteristicsTest, SimpleRsa) { TEST_F(GetKeyCharacteristicsTest, SimpleRsa) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(256, 3) .RsaSigningKey(1024, 3)
.Digest(Digest::NONE) .Digest(Digest::NONE)
.Padding(PaddingMode::NONE))); .Padding(PaddingMode::NONE)));
@ -2201,7 +2201,7 @@ typedef KeymasterHidlTest ExportKeyTest;
*/ */
TEST_F(ExportKeyTest, RsaUnsupportedKeyFormat) { TEST_F(ExportKeyTest, RsaUnsupportedKeyFormat) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(256, 3) .RsaSigningKey(1024, 3)
.Digest(Digest::NONE) .Digest(Digest::NONE)
.Padding(PaddingMode::NONE))); .Padding(PaddingMode::NONE)));
HidlBuf export_data; HidlBuf export_data;
@ -2218,7 +2218,7 @@ TEST_F(ExportKeyTest, RsaUnsupportedKeyFormat) {
TEST_F(ExportKeyTest, DISABLED_RsaCorruptedKeyBlob) { TEST_F(ExportKeyTest, DISABLED_RsaCorruptedKeyBlob) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED) .Authorization(TAG_NO_AUTH_REQUIRED)
.RsaSigningKey(256, 3) .RsaSigningKey(1024, 3)
.Digest(Digest::NONE) .Digest(Digest::NONE)
.Padding(PaddingMode::NONE))); .Padding(PaddingMode::NONE)));
for (size_t i = 0; i < key_blob_.size(); ++i) { for (size_t i = 0; i < key_blob_.size(); ++i) {