commit 3b4e1652ac6fca90a47759f84946a9728c251cd7
author Shawn Willden <swillden@google.com> Fri Feb 27 13:33:01 2015 -0700
committer Shawn Willden <swillden@google.com> Tue Mar 17 20:35:45 2015 -0600
tree 8e573b02b28d074bc8d8db8057bb0e081c255f3d
parent 95dda36620149d1b8de57d175df9ba34a64e895d

Remove default key parameters in RSA and ECDSA key generation.

Bug: 19427294
Change-Id: I3e9a1fd06d39d310e3ae36206a516003b4ed89ac

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index 931a9e1..900db53 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -273,19 +273,11 @@
 }
 
 TEST_F(NewKeyGeneration, RsaDefaultSize) {
-    ASSERT_EQ(
-        KM_ERROR_OK,
-        GenerateKey(
-            AuthorizationSetBuilder().Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA).SigningKey()));
-
-    CheckBaseParams();
-
-    // Check specified tags are all present in unenforced characteristics
-    EXPECT_TRUE(contains(sw_enforced(), TAG_ALGORITHM, KM_ALGORITHM_RSA));
-
-    // Now check that unspecified, defaulted tags are correct.
-    EXPECT_TRUE(contains(sw_enforced(), TAG_RSA_PUBLIC_EXPONENT, 65537));
-    EXPECT_TRUE(contains(sw_enforced(), TAG_KEY_SIZE, 2048));
+    ASSERT_EQ(KM_ERROR_UNSUPPORTED_KEY_SIZE,
+              GenerateKey(AuthorizationSetBuilder()
+                              .Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
+                              .Authorization(TAG_RSA_PUBLIC_EXPONENT, 3)
+                              .SigningKey()));
 }
 
 TEST_F(NewKeyGeneration, Ecdsa) {