Added serialization to SecureHash.

crypto/secure_hash_openssl.cc

Index: crypto/secure_hash_openssl.cc
diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc
index 8e2f128c6a9f647cc011bda44b9a701177caa37d..3ba69cb43dd2be2360954170a96b645ef7015389 100644
--- a/crypto/secure_hash_openssl.cc
+++ b/crypto/secure_hash_openssl.cc
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/pickle.h"
 #include "crypto/openssl_util.h"
 
 namespace crypto {
@@ -16,6 +17,9 @@ namespace {
 
 class SecureHashSHA256OpenSSL : public SecureHash {
  public:
+  static const int kSecureHashVersion = 1;

[agl, 2011/11/18 19:57:02]

all the same comments apply to this file.

[ahendrickson, 2011/11/18 21:23:09]

Done.

+  static const char* kDescriptor;
+
   SecureHashSHA256OpenSSL() {
     SHA256_Init(&ctx_);
   }
@@ -34,10 +38,58 @@ class SecureHashSHA256OpenSSL : public SecureHash {
     SHA256_Final(result.safe_buffer(), &ctx_);
   }
 
+  virtual bool Serialize(Pickle* pickle);
+  virtual bool Deserialize(Pickle* pickle);
+
  private:
   SHA256_CTX ctx_;
 };
 
+const char* SecureHashSHA256OpenSSL::kDescriptor = "OpenSSL";
+
+bool SecureHashSHA256OpenSSL::Serialize(Pickle* pickle) {
+  if (!pickle)
+    return false;
+
+  if (!pickle->WriteInt(kSecureHashVersion))
+    return false;
+  if (!pickle->WriteString(kDescriptor))
+    return false;
+  if (!pickle->WriteBytes(&ctx_, sizeof(ctx_)))
+    return false;
+
+  return true;
+}
+
+bool SecureHashSHA256OpenSSL::Deserialize(Pickle* pickle) {
+  if (!pickle)
+    return false;
+
+  void* data_iterator = NULL;
+  int version;
+  if (!pickle->ReadInt(&data_iterator, &version))
+    return false;
+
+  if (version > kSecureHashVersion)
+    return false;  // We don't know how to deal with this.
+
+  std::string type;
+  if (!pickle->ReadString(&data_iterator, &type))
+    return false;
+
+  if (type != kDescriptor)
+    return false;  // It's the wrong kind.
+
+  char data_buffer[sizeof(ctx_)] = "";
+  const char* data = data_buffer;
+  if (!pickle->ReadBytes(&data_iterator, &data, sizeof(ctx_)))
+    return false;
+
+  memcpy(&ctx_, data, sizeof(ctx_));
+
+  return true;
+}
+
 }  // namespace
 
 SecureHash* SecureHash::Create(Algorithm algorithm) {