Added serialization to SecureHash.

crypto/secure_hash_openssl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/secure_hash.h"
 
 #include <openssl/ssl.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/pickle.h"
 #include "crypto/openssl_util.h"
 
 namespace crypto {
 
 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_);
   }
 
   virtual ~SecureHashSHA256OpenSSL() {
     OPENSSL_cleanse(&ctx_, sizeof(ctx_));
   }
 
   virtual void Update(const void* input, size_t len) {
     SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len);
   }
 
   virtual void Finish(void* output, size_t len) {
     ScopedOpenSSLSafeSizeBuffer<SHA256_DIGEST_LENGTH> result(
         static_cast<unsigned char*>(output), len);
     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) {
   switch (algorithm) {
     case SHA256:
       return new SecureHashSHA256OpenSSL();
     default:
       NOTIMPLEMENTED();
       return NULL;
   }
 }
 
 }  // namespace crypto