Added serialization to SecureHash.

crypto/secure_hash_default.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 "base/logging.h"
+#include "base/pickle.h"
 #include "crypto/third_party/nss/chromium-blapi.h"
 #include "crypto/third_party/nss/chromium-sha256.h"
 
 namespace crypto {
 
 namespace {
 
 class SecureHashSHA256NSS : public SecureHash {
  public:
+  static const int kSecureHashVersion = 1;
+  static const char* kDescriptor;
+
   SecureHashSHA256NSS() {
     SHA256_Begin(&ctx_);
   }
 
   virtual ~SecureHashSHA256NSS() {
   }
 
   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) {
     SHA256_End(&ctx_, static_cast<unsigned char*>(output), NULL,
                static_cast<unsigned int>(len));
   }
 
+  virtual bool Serialize(Pickle* pickle);
+  virtual bool Deserialize(Pickle* pickle);
+
  private:
   SHA256Context ctx_;
 };
 
+const char* SecureHashSHA256NSS::kDescriptor = "NSS";

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

Move it out of the class and do:

static const char kSHA256Descriptor[] = "NSS";

to save a relocation record.

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

Done.

+
+bool SecureHashSHA256NSS::Serialize(Pickle* pickle) {
+  if (!pickle)
+    return false;
+
+  if (!pickle->WriteInt(kSecureHashVersion))

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

if (!pickle->WriteInt(kSecureHashVersion) ||
    !pickle->WriteString(kDescriptor) ||
    !pickle->WriteBytes(&ctx_, sizeof(ctx_))) {
  return false;
}

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

Done.

+    return false;
+  if (!pickle->WriteString(kDescriptor))
+    return false;
+  if (!pickle->WriteBytes(&ctx_, sizeof(ctx_)))
+    return false;
+
+  return true;
+}
+
+bool SecureHashSHA256NSS::Deserialize(Pickle* pickle) {

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

this interface (specifically the lack of a void* iterator param) precludes the
serialized hash being part of a larger Pickle.

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

Fixed.

+  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_)] = "";

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

Pickle doesn't need a buffer to write it. It sets |data| to point into the
underlying bytes.

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

Done.

+  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 SecureHashSHA256NSS();
     default:
       NOTIMPLEMENTED();
       return NULL;
   }
 }
 
 }  // namespace crypto