diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-03 20:03:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-03 20:03:33 +0000 |
| commit | db21c8e59eb9fe9872031ac8f5a6f52dda4eb38a (patch) | |
| tree | 08ef9158ff3ad2ac0a8443bae4453bcdca61e0d6 | |
| parent | 8cd73b33ec7675826552c402975a05f97e6e7e73 (diff) | |
| parent | 97a86592422864c18db17a55d82c372c07a0d413 (diff) | |
Merge "Fixing RSA tests not using the correct exponent" am: ba111275cb am: 97a8659242
Change-Id: I6914b88f2a65188bd5057cca7c85c6bd58e05126
| -rw-r--r-- | keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp index 0e1228398b..4409bdea57 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp @@ -527,9 +527,9 @@ TEST_F(NewKeyGenerationTest, Rsa) { HidlBuf key_blob; KeyCharacteristics key_characteristics; ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() - .RsaSigningKey(key_size, 3) - .Digest(Digest::NONE) - .Padding(PaddingMode::NONE), + .RsaSigningKey(key_size, 65537) + .Digest(Digest::NONE) + .Padding(PaddingMode::NONE), &key_blob, &key_characteristics)); ASSERT_GT(key_blob.size(), 0U); @@ -579,11 +579,12 @@ TEST_F(NewKeyGenerationTest, NoInvalidRsaSizes) { for (auto key_size : InvalidKeySizes(Algorithm::RSA)) { HidlBuf key_blob; KeyCharacteristics key_characteristics; - ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, GenerateKey(AuthorizationSetBuilder() - .RsaSigningKey(key_size, 3) - .Digest(Digest::NONE) - .Padding(PaddingMode::NONE), - &key_blob, &key_characteristics)); + ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, + GenerateKey(AuthorizationSetBuilder() + .RsaSigningKey(key_size, 65537) + .Digest(Digest::NONE) + .Padding(PaddingMode::NONE), + &key_blob, &key_characteristics)); } } |