Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: net/base/openssl_memory_private_key_store.cc

Issue 6276002: Abstracts SHA256 context for NSS / OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moves to SecureHash (and other comments) Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/openssl_memory_private_key_store.cc
diff --git a/net/base/openssl_memory_private_key_store.cc b/net/base/openssl_memory_private_key_store.cc
index bc64b570cf269208f74ff7b7bd3dc3abf5bb0bca..b6818d1ea12743d336f40697a610913aade29eec 100644
--- a/net/base/openssl_memory_private_key_store.cc
+++ b/net/base/openssl_memory_private_key_store.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/openssl_util.h"
+#include "base/synchronization/lock.h"
wtc 2011/01/25 19:06:43 Nit: list this header after "base/singleton.h".
bulach 2011/01/25 20:33:41 Done.
#include "base/singleton.h"
#include "net/base/x509_certificate.h"
@@ -52,7 +53,7 @@ class OpenSSLMemoryKeyStore : public OpenSSLPrivateKeyStore {
private:
std::vector<EVP_PKEY*> keys_;
- Lock lock_;
+ base::Lock lock_;
DISALLOW_COPY_AND_ASSIGN(OpenSSLMemoryKeyStore);
};

Powered by Google App Engine
This is Rietveld 408576698