summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 11:21:07 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 11:21:07 +0000
commitc322aa9bac52f4ec49fbc6abb4f394ff29ae9922 (patch)
tree9ed1e95d052397f325c938b67a90b41b4c51932f /net/base
parent6954715002b52e52061bc03c1307e4e450cd910c (diff)
downloadchromium_src-c322aa9bac52f4ec49fbc6abb4f394ff29ae9922.zip
chromium_src-c322aa9bac52f4ec49fbc6abb4f394ff29ae9922.tar.gz
chromium_src-c322aa9bac52f4ec49fbc6abb4f394ff29ae9922.tar.bz2
Abstracts SHA256 context for NSS / OpenSSL.
Stubs out SslServerSocket for OpenSSL. BUG=none TEST=Sha256Test.TestContext (and compiles with openssl flag). Review URL: http://codereview.chromium.org/6276002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/openssl_memory_private_key_store.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/openssl_memory_private_key_store.cc b/net/base/openssl_memory_private_key_store.cc
index bc64b57..5572b67 100644
--- a/net/base/openssl_memory_private_key_store.cc
+++ b/net/base/openssl_memory_private_key_store.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/openssl_util.h"
#include "base/singleton.h"
+#include "base/synchronization/lock.h"
#include "net/base/x509_certificate.h"
namespace net {
@@ -52,7 +53,7 @@ class OpenSSLMemoryKeyStore : public OpenSSLPrivateKeyStore {
private:
std::vector<EVP_PKEY*> keys_;
- Lock lock_;
+ base::Lock lock_;
DISALLOW_COPY_AND_ASSIGN(OpenSSLMemoryKeyStore);
};