commit 3025502b3f6094c675a732cbfeb9ff3d7801e3a2
author Shawn Willden <swillden@google.com> Tue Feb 24 14:00:21 2015 -0700
committer Shawn Willden <swillden@google.com> Wed Feb 25 17:58:47 2015 -0700
tree 3106825db53342f5464858753e5b6b11f1de0178
parent 26aaa76e18a1a1bc92c7d5ee6ecc62769dd764ec

Separate keymaster0 and keymaster1 HALs.

For the moment soft_keymaster_device still supports the keymaster0
APIs.  This will change soon.

Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index 9306143..04b50e8 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -179,7 +179,9 @@
         FreeKeyBlob();
     }
 
-    keymaster_device* device() { return reinterpret_cast<keymaster_device*>(device_.hw_device()); }
+    keymaster1_device_t* device() {
+        return reinterpret_cast<keymaster1_device_t*>(device_.hw_device());
+    }
 
     keymaster_error_t GenerateKey(const ParamBuilder& builder) {
         AuthorizationSet params(builder.build());
@@ -528,45 +530,6 @@
     free(formats);
 }
 
-TEST_F(KeymasterTest, TestFlags) {
-    EXPECT_TRUE(device()->flags & KEYMASTER_SOFTWARE_ONLY);
-    EXPECT_TRUE(device()->flags & KEYMASTER_BLOBS_ARE_STANDALONE);
-    EXPECT_FALSE(device()->flags & KEYMASTER_SUPPORTS_DSA);
-    EXPECT_TRUE(device()->flags & KEYMASTER_SUPPORTS_EC);
-}
-
-typedef KeymasterTest OldKeyGeneration;
-
-TEST_F(OldKeyGeneration, Rsa) {
-    keymaster_rsa_keygen_params_t params = {.modulus_size = 256, .public_exponent = 3};
-    uint8_t* key_blob;
-    size_t key_blob_length;
-    EXPECT_EQ(0,
-              device()->generate_keypair(device(), TYPE_RSA, &params, &key_blob, &key_blob_length));
-    EXPECT_GT(key_blob_length, 0);
-
-    free(key_blob);
-}
-
-TEST_F(OldKeyGeneration, Ecdsa256) {
-    keymaster_ec_keygen_params_t params = {.field_size = 256};
-    uint8_t* key_blob;
-    size_t key_blob_length;
-    EXPECT_EQ(0,
-              device()->generate_keypair(device(), TYPE_EC, &params, &key_blob, &key_blob_length));
-    EXPECT_GT(key_blob_length, 0);
-
-    free(key_blob);
-}
-
-TEST_F(OldKeyGeneration, Ecdsa192Fails) {
-    keymaster_ec_keygen_params_t params = {.field_size = 192};
-    uint8_t* key_blob;
-    size_t key_blob_length;
-    EXPECT_EQ(KM_ERROR_UNSUPPORTED_KEY_SIZE,
-              device()->generate_keypair(device(), TYPE_EC, &params, &key_blob, &key_blob_length));
-}
-
 class NewKeyGeneration : public KeymasterTest {
   protected:
     void CheckBaseParams() {