commit 8d336ae10df66da4c0433f17c2d42e85baea32c5
author Shawn Willden <swillden@google.com> Sat Aug 09 15:47:05 2014 -0600
committer Shawn Willden <swillden@google.com> Sat Aug 09 15:47:05 2014 -0600
tree 8b565da7dbde2f41aa521ca573b9a3f9a23f109b
parent 4db3fbdda292c0c3120dfe160c1b49670aa18600

Change authorization set serialization approach to ensure that 32 vs 64
bit size and alignment differences don't cause problems.

Change-Id: I4a308cfac782161db2f1456adb2d6a56537e61f1

google_keymaster_messages_test.cpp

diff --git a/google_keymaster_messages_test.cpp b/google_keymaster_messages_test.cpp
index 772d85c..11321eb 100644
--- a/google_keymaster_messages_test.cpp
+++ b/google_keymaster_messages_test.cpp
@@ -46,7 +46,7 @@
     req.key_description.Reinitialize(params, array_length(params));
 
     size_t size = req.SerializedSize();
-    EXPECT_EQ(182U, size);
+    EXPECT_EQ(78U, size);
 
     UniquePtr<uint8_t[]> buf(new uint8_t[size]);
     EXPECT_EQ(buf.get() + size, req.Serialize(buf.get(), buf.get() + size));
@@ -102,7 +102,7 @@
     rsp.enforced.Reinitialize(params, array_length(params));
 
     size_t size = rsp.SerializedSize();
-    EXPECT_EQ(217U, size);
+    EXPECT_EQ(117U, size);
 
     UniquePtr<uint8_t[]> buf(new uint8_t[size]);
     EXPECT_EQ(buf.get() + size, rsp.Serialize(buf.get(), buf.get() + size));