summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 00:36:58 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 00:36:58 +0000
commit3de9cc2fa2931a9d343f5bb09c74674967ef4c98 (patch)
tree6e8a13d82aee3822a8a66cafb6eb50f35c1890f5
parent399882394634321111b6caf55136760b3ce3b471 (diff)
downloadchromium_src-3de9cc2fa2931a9d343f5bb09c74674967ef4c98.zip
chromium_src-3de9cc2fa2931a9d343f5bb09c74674967ef4c98.tar.gz
chromium_src-3de9cc2fa2931a9d343f5bb09c74674967ef4c98.tar.bz2
Fix nits in SecureHash.
R=agl@chromium.org,rsleevi@chromium.org BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/11299235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170308 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--crypto/secure_hash_default.cc1
-rw-r--r--crypto/secure_hash_openssl.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/secure_hash_default.cc b/crypto/secure_hash_default.cc
index b743b4c..7b912e1 100644
--- a/crypto/secure_hash_default.cc
+++ b/crypto/secure_hash_default.cc
@@ -24,6 +24,7 @@ class SecureHashSHA256NSS : public SecureHash {
}
virtual ~SecureHashSHA256NSS() {
+ memset(&ctx_, 0, sizeof(ctx_));
}
// SecureHash implementation:
diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc
index a542e22..743057b 100644
--- a/crypto/secure_hash_openssl.cc
+++ b/crypto/secure_hash_openssl.cc
@@ -4,7 +4,8 @@
#include "crypto/secure_hash.h"
-#include <openssl/ssl.h>
+#include <openssl/crypto.h>
+#include <openssl/sha.h>
#include "base/basictypes.h"
#include "base/logging.h"