commit 58e1a5486219a1be9264d4e863a9dd3e393906c3
author Shawn Willden <swillden@google.com> Fri Aug 08 21:58:29 2014 -0600
committer Shawn Willden <swillden@google.com> Fri Aug 08 21:58:29 2014 -0600
tree 9c38723969b22071597e2b11f9dc97d42292e244
parent 301646f55214ed693e79c7869d54033a74641907

Eliminate in-place serialization.

Not doing in-place serialization will result in greater heap
consumption, but eliminates many alignment-related issues.  Given more
time, I'd prefer to solve the alignment issues by computing and
inserting appropriate padding, but we don't have the time.

Change-Id: I86e4bdf57263db26c73372ae2963f21c5f5f00aa

google_keymaster_messages_test.cpp

diff --git a/google_keymaster_messages_test.cpp b/google_keymaster_messages_test.cpp
index 6010572..772d85c 100644
--- a/google_keymaster_messages_test.cpp
+++ b/google_keymaster_messages_test.cpp
@@ -49,11 +49,11 @@
     EXPECT_EQ(182U, size);
 
     UniquePtr<uint8_t[]> buf(new uint8_t[size]);
-    EXPECT_EQ(buf.get() + size, req.Serialize(buf.get()));
+    EXPECT_EQ(buf.get() + size, req.Serialize(buf.get(), buf.get() + size));
 
     GenerateKeyRequest deserialized1;
-    uint8_t* p = buf.get();
-    EXPECT_TRUE(deserialized1.DeserializeInPlace(&p, p + size));
+    const uint8_t* p = buf.get();
+    EXPECT_TRUE(deserialized1.Deserialize(&p, p + size));
     EXPECT_EQ(7U, deserialized1.key_description.size());
 
     // Check a few entries.
@@ -70,7 +70,7 @@
 
     GenerateKeyRequest deserialized2;
     const uint8_t* p2 = buf.get();
-    EXPECT_TRUE(deserialized2.DeserializeToCopy(&p2, p2 + size));
+    EXPECT_TRUE(deserialized2.Deserialize(&p2, p2 + size));
     EXPECT_EQ(7U, deserialized2.key_description.size());
 
     // Check a few entries.
@@ -105,16 +105,11 @@
     EXPECT_EQ(217U, size);
 
     UniquePtr<uint8_t[]> buf(new uint8_t[size]);
-    EXPECT_EQ(buf.get() + size, rsp.Serialize(buf.get()));
+    EXPECT_EQ(buf.get() + size, rsp.Serialize(buf.get(), buf.get() + size));
 
     GenerateKeyResponse deserialized;
-    uint8_t* p = buf.get();
-
-    // DeserializeInPlace is not implemented.
-    EXPECT_FALSE(deserialized.DeserializeInPlace(&p, p + size));
-
-    const uint8_t* p2 = buf.get();
-    EXPECT_TRUE(deserialized.DeserializeToCopy(&p2, p2 + size));
+    const uint8_t* p = buf.get();
+    EXPECT_TRUE(deserialized.Deserialize(&p, p + size));
     EXPECT_EQ(7U, deserialized.enforced.size());
 
     EXPECT_EQ(0U, deserialized.unenforced.size());
@@ -153,11 +148,11 @@
     EXPECT_EQ(4U, size);
 
     UniquePtr<uint8_t[]> buf(new uint8_t[size]);
-    EXPECT_EQ(buf.get() + size, rsp.Serialize(buf.get()));
+    EXPECT_EQ(buf.get() + size, rsp.Serialize(buf.get(), buf.get() + size));
 
     GenerateKeyResponse deserialized;
     const uint8_t* p = buf.get();
-    EXPECT_TRUE(deserialized.DeserializeToCopy(&p, p + size));
+    EXPECT_TRUE(deserialized.Deserialize(&p, p + size));
     EXPECT_EQ(KM_ERROR_UNSUPPORTED_ALGORITHM, deserialized.error);
     EXPECT_EQ(0U, deserialized.enforced.size());
     EXPECT_EQ(0U, deserialized.unenforced.size());