commit abd5bc665419459b5967690c792ec6e4a074e779
author The Android Automerger <android-build@android.com> Wed May 15 05:55:32 2013 -0700
committer The Android Automerger <android-build@android.com> Wed May 15 05:55:32 2013 -0700
tree 16154dfa4402ec6f11ca1af0c0b4b988ca52da28
parent 63b64337fbaa10b282f85a7e887b40ced6d6d632
parent 8282f0ba9d452c825f6438c5349798d64ccd5d7f

merge in jb-mr2-release history after reset to jb-mr2-dev

tests/keymaster/keymaster_test.cpp

diff --git a/tests/keymaster/keymaster_test.cpp b/tests/keymaster/keymaster_test.cpp
index 57e7dc8..0046ea4 100644
--- a/tests/keymaster/keymaster_test.cpp
+++ b/tests/keymaster/keymaster_test.cpp
@@ -392,7 +392,7 @@
 
 INSTANTIATE_TEST_CASE_P(RSA,
                         KeymasterGenerateTest,
-                        ::testing::Values(512U, 1024U, 2048U));
+                        ::testing::Values(512U, 1024U, 2048U, 3072U, 4096U));
 
 TEST_F(KeymasterTest, GenerateKeyPair_RSA_NullParams_Failure) {
     keymaster_keypair_t key_type = TYPE_RSA;