Index: crypto/secure_hash_openssl.cc |
diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc |
index 8e2f128c6a9f647cc011bda44b9a701177caa37d..9901e20d428e84327805fc81018e370b074984b8 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; |
+ static const char* kDescriptor; |
+ |
SecureHashSHA256OpenSSL() { |
SHA256_Init(&ctx_); |
} |
@@ -34,10 +38,55 @@ 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. |
+ |
+ const char* data = reinterpret_cast<char*>(&ctx_); |
+ if (!pickle->ReadBytes(&data_iterator, &data, sizeof(ctx_))) |
+ return false; |
+ |
+ return true; |
+} |
+ |
} // namespace |
SecureHash* SecureHash::Create(Algorithm algorithm) { |