| Index: crypto/secure_hash_openssl.cc
|
| diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc
|
| index 8e2f128c6a9f647cc011bda44b9a701177caa37d..6cf41968003616ec400ebb97979a5982c7b0dda4 100644
|
| --- a/crypto/secure_hash_openssl.cc
|
| +++ b/crypto/secure_hash_openssl.cc
|
| @@ -8,14 +8,19 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/logging.h"
|
| +#include "base/pickle.h"
|
| #include "crypto/openssl_util.h"
|
|
|
| namespace crypto {
|
|
|
| namespace {
|
|
|
| +const char kSHA256Descriptor[] = "OpenSSL";
|
| +
|
| class SecureHashSHA256OpenSSL : public SecureHash {
|
| public:
|
| + static const int kSecureHashVersion = 1;
|
| +
|
| SecureHashSHA256OpenSSL() {
|
| SHA256_Init(&ctx_);
|
| }
|
| @@ -34,10 +39,54 @@ class SecureHashSHA256OpenSSL : public SecureHash {
|
| SHA256_Final(result.safe_buffer(), &ctx_);
|
| }
|
|
|
| + virtual bool Serialize(Pickle* pickle);
|
| + virtual bool Deserialize(void** data_iterator, Pickle* pickle);
|
| +
|
| private:
|
| SHA256_CTX ctx_;
|
| };
|
|
|
| +bool SecureHashSHA256OpenSSL::Serialize(Pickle* pickle) {
|
| + if (!pickle)
|
| + return false;
|
| +
|
| + if (!pickle->WriteInt(kSecureHashVersion) ||
|
| + !pickle->WriteString(kSHA256Descriptor) ||
|
| + !pickle->WriteBytes(&ctx_, sizeof(ctx_))) {
|
| + return false;
|
| + }
|
| +
|
| + return true;
|
| +}
|
| +
|
| +bool SecureHashSHA256OpenSSL::Deserialize(void** data_iterator,
|
| + Pickle* pickle) {
|
| + if (!pickle)
|
| + return false;
|
| +
|
| + 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 != kSHA256Descriptor)
|
| + return false; // It's the wrong kind.
|
| +
|
| + const char* data = NULL;
|
| + if (!pickle->ReadBytes(data_iterator, &data, sizeof(ctx_)))
|
| + return false;
|
| +
|
| + memcpy(&ctx_, data, sizeof(ctx_));
|
| +
|
| + return true;
|
| +}
|
| +
|
| } // namespace
|
|
|
| SecureHash* SecureHash::Create(Algorithm algorithm) {
|
|
|