commit 80f0ec69eb3d9760f5d7f3e8d726b6091757ea8b
author Shawn Willden <swillden@google.com> Tue May 26 12:52:54 2015 -0600
committer Shawn Willden <swillden@google.com> Fri Jun 12 12:15:32 2015 -0600
tree b7e0c61dc1d8c4e7fcf6eff708a73804449c8e88
parent ac3980627ab3420463ca787be441ac363726ed12

Fix broken ECDSA default key size test.

Cherry-picked from internal.

Change-Id: Ie1ef1822dfb0328bdd37907e450eeb8789d7c3f6

android_keymaster_test.cpp

diff --git a/android_keymaster_test.cpp b/android_keymaster_test.cpp
index 93a0323..f68733b 100644
--- a/android_keymaster_test.cpp
+++ b/android_keymaster_test.cpp
@@ -340,15 +340,11 @@
 }
 
 TEST_P(NewKeyGeneration, EcdsaDefaultSize) {
-    ASSERT_EQ(KM_ERROR_OK,
-              GenerateKey(AuthorizationSetBuilder().EcdsaSigningKey(224).Digest(KM_DIGEST_NONE)));
-    CheckBaseParams();
-
-    // Check specified tags are all present in unenforced characteristics
-    EXPECT_TRUE(contains(sw_enforced(), TAG_ALGORITHM, KM_ALGORITHM_EC));
-
-    // Now check that unspecified, defaulted tags are correct.
-    EXPECT_TRUE(contains(sw_enforced(), TAG_KEY_SIZE, 224));
+    ASSERT_EQ(KM_ERROR_UNSUPPORTED_KEY_SIZE,
+              GenerateKey(AuthorizationSetBuilder()
+                              .Authorization(TAG_ALGORITHM, KM_ALGORITHM_EC)
+                              .SigningKey()
+                              .Digest(KM_DIGEST_NONE)));
 
     if (GetParam()->expect_keymaster0_calls())
         EXPECT_EQ(0, GetParam()->keymaster0_calls());