commit da8485ea42e53839579575ec9fc2b49f7cf1a1f9
author Shawn Willden <swillden@google.com> Sun Aug 17 08:00:01 2014 -0600
committer Shawn Willden <swillden@google.com> Tue Aug 19 15:39:31 2014 -0600
tree c5eb4847dbfa0242211f3fd42c237383caf59a7a
parent 172f8c9be706e27f43022063bbc7f4b0177583ac

Flesh out all remaining message structures, with serialization.

Still didn't implement recsoping messages, since they're not relevant
for 0.3.

Change-Id: Ia05a04349ff0329557b01d14f6c501540cc74439

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index cb9c32e..fc1f825 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -37,11 +37,8 @@
 
 class KeymasterTest : public testing::Test {
   protected:
-    KeymasterTest() : device(5) {
-        RAND_seed("foobar", 6);
-    }
-    ~KeymasterTest() {
-    }
+    KeymasterTest() : device(5) { RAND_seed("foobar", 6); }
+    ~KeymasterTest() {}
 
     GoogleSoftKeymaster device;
 };
@@ -250,7 +247,7 @@
     ASSERT_EQ(KM_ERROR_OK, gen_rsp.error);
 
     GetKeyCharacteristicsRequest req;
-    req.key_blob = gen_rsp.key_blob;
+    req.SetKeyMaterial(gen_rsp.key_blob);
     req.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
     GetKeyCharacteristicsResponse rsp;
@@ -299,7 +296,7 @@
 
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.purpose = KM_PURPOSE_SIGN;
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
@@ -332,7 +329,7 @@
 
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.purpose = KM_PURPOSE_SIGN;
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
@@ -352,7 +349,7 @@
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
     begin_request.purpose = KM_PURPOSE_SIGN;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
     device.BeginOperation(begin_request, &begin_response);
@@ -368,7 +365,7 @@
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
     begin_request.purpose = KM_PURPOSE_SIGN;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
     device.BeginOperation(begin_request, &begin_response);
@@ -385,7 +382,7 @@
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
     begin_request.purpose = KM_PURPOSE_SIGN;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
     device.BeginOperation(begin_request, &begin_response);
@@ -402,7 +399,7 @@
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
     begin_request.purpose = KM_PURPOSE_SIGN;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
     device.BeginOperation(begin_request, &begin_response);
@@ -417,7 +414,7 @@
 
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
-    begin_request.key_blob = *key;
+    begin_request.SetKeyMaterial(*key);
     begin_request.purpose = KM_PURPOSE_SIGN;
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
@@ -451,8 +448,7 @@
         finish_response_.error = KM_ERROR_UNKNOWN_ERROR;
     }
 
-    void GenerateKey(keymaster_digest_t digest, keymaster_padding_t padding,
-                                      uint32_t key_size) {
+    void GenerateKey(keymaster_digest_t digest, keymaster_padding_t padding, uint32_t key_size) {
         keymaster_key_param_t params[] = {
             Authorization(TAG_PURPOSE, KM_PURPOSE_SIGN),
             Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY),
@@ -474,7 +470,7 @@
 
         BeginOperationRequest begin_request;
         BeginOperationResponse begin_response;
-        begin_request.key_blob = generate_response_.key_blob;
+        begin_request.SetKeyMaterial(generate_response_.key_blob);
         begin_request.purpose = KM_PURPOSE_SIGN;
         begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);
 
@@ -522,7 +518,7 @@
 
     BeginOperationRequest begin_request;
     BeginOperationResponse begin_response;
-    begin_request.key_blob = *key_blob();
+    begin_request.SetKeyMaterial(*key_blob());
     begin_request.purpose = KM_PURPOSE_VERIFY;
     begin_request.additional_params.push_back(TAG_APPLICATION_ID, "app_id", 6);