commit 7dad93b6552a2253ad6e7a493ddf0c9113806712
author Shawn Willden <swillden@google.com> Thu Feb 05 10:20:47 2015 -0700
committer Shawn Willden <swillden@google.com> Wed Mar 04 13:22:16 2015 -0700
tree babf95d2be523623ec9c8c92300febdec119f7ef
parent f0f68b976b0ffac10d3e0efddc5bee38fd9d1ea3

Implement symmetric key import.

Change-Id: I902933c06c74c7b3b434873f53fb2c767d3b9721

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index b0c47d8..bb19ada 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -506,6 +506,16 @@
               device()->get_supported_import_formats(device(), KM_ALGORITHM_RSA, &formats, &len));
     EXPECT_TRUE(ResponseContains(KM_KEY_FORMAT_PKCS8, formats, len));
     free(formats);
+
+    EXPECT_EQ(KM_ERROR_OK,
+              device()->get_supported_import_formats(device(), KM_ALGORITHM_AES, &formats, &len));
+    EXPECT_TRUE(ResponseContains(KM_KEY_FORMAT_RAW, formats, len));
+    free(formats);
+
+    EXPECT_EQ(KM_ERROR_OK,
+              device()->get_supported_import_formats(device(), KM_ALGORITHM_HMAC, &formats, &len));
+    EXPECT_TRUE(ResponseContains(KM_KEY_FORMAT_RAW, formats, len));
+    free(formats);
 }
 
 TEST_F(CheckSupported, SupportedExportFormats) {
@@ -531,6 +541,16 @@
               device()->get_supported_export_formats(device(), KM_ALGORITHM_AES, &formats, &len));
     EXPECT_EQ(0, len);
     free(formats);
+
+    EXPECT_EQ(KM_ERROR_OK,
+              device()->get_supported_export_formats(device(), KM_ALGORITHM_AES, &formats, &len));
+    EXPECT_EQ(0, len);
+    free(formats);
+
+    EXPECT_EQ(KM_ERROR_OK,
+              device()->get_supported_export_formats(device(), KM_ALGORITHM_HMAC, &formats, &len));
+    EXPECT_EQ(0, len);
+    free(formats);
 }
 
 class NewKeyGeneration : public KeymasterTest {
@@ -626,8 +646,8 @@
 }
 
 TEST_F(NewKeyGeneration, AesOcbInvalidKeySize) {
-    ASSERT_EQ(KM_ERROR_OK, GenerateKey(ParamBuilder().AesEncryptionKey(136).OcbMode(4096, 16)));
-    EXPECT_EQ(KM_ERROR_UNSUPPORTED_KEY_SIZE, BeginOperation(KM_PURPOSE_ENCRYPT));
+    ASSERT_EQ(KM_ERROR_UNSUPPORTED_KEY_SIZE,
+              GenerateKey(ParamBuilder().AesEncryptionKey(136).OcbMode(4096, 16)));
 }
 
 TEST_F(NewKeyGeneration, AesOcbAllValidSizes) {
@@ -1096,6 +1116,15 @@
     ASSERT_EQ(KM_ERROR_INVALID_KEY_BLOB, ExportKey(KM_KEY_FORMAT_X509, &export_data));
 }
 
+TEST_F(ExportKeyTest, AesKeyExportFails) {
+    ASSERT_EQ(KM_ERROR_OK, GenerateKey(ParamBuilder().AesEncryptionKey(128)));
+    string export_data;
+
+    EXPECT_EQ(KM_ERROR_UNSUPPORTED_KEY_FORMAT, ExportKey(KM_KEY_FORMAT_X509, &export_data));
+    EXPECT_EQ(KM_ERROR_UNSUPPORTED_KEY_FORMAT, ExportKey(KM_KEY_FORMAT_PKCS8, &export_data));
+    EXPECT_EQ(KM_ERROR_UNSUPPORTED_KEY_FORMAT, ExportKey(KM_KEY_FORMAT_RAW, &export_data));
+}
+
 static string read_file(const string& file_name) {
     ifstream file_stream(file_name, std::ios::binary);
     istreambuf_iterator<char> file_begin(file_stream);