summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 13:09:26 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 13:09:26 +0000
commitdba10cbee723fae0ee13b30366e6b371fc5e13f3 (patch)
tree0400a221144e4bcea35b439beeb287f75d66e660 /net
parentc3d00c8bd8e3652890db6e0525fb5c62a912c123 (diff)
downloadchromium_src-dba10cbee723fae0ee13b30366e6b371fc5e13f3.zip
chromium_src-dba10cbee723fae0ee13b30366e6b371fc5e13f3.tar.gz
chromium_src-dba10cbee723fae0ee13b30366e6b371fc5e13f3.tar.bz2
Fix openssl build
In follow up to http://codereview.chromium.org/6805019/ fixes a couple namespace issues. BUG=None TEST=Builds with use_openssl=1 set. Review URL: http://codereview.chromium.org/6865011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/ssl_server_socket_openssl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index 0928bbb..68c26fe 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -51,7 +51,7 @@ class SSLServerSocketOpenSSL : public SSLServerSocket {
SSLServerSocket* CreateSSLServerSocket(Socket* socket,
X509Certificate* certificate,
- base::RSAPrivateKey* key,
+ crypto::RSAPrivateKey* key,
const SSLConfig& ssl_config) {
return new SSLServerSocketOpenSSL();
}