diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:19:44 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:19:44 +0000 |
| commit | a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03 (patch) | |
| tree | af5d5f1fd060390bc5dae29b21837441970d97d9 /net/socket/ssl_server_socket_openssl.cc | |
| parent | f28b436a33f65b1d22d8c7f047fe1c61d70f7920 (diff) | |
| download | chromium_src-a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03.zip chromium_src-a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03.tar.gz chromium_src-a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03.tar.bz2 | |
Add an explicit function to init NSS for SSL server sockets
BUG=131622
TEST=tsan goes green for existing tests
Review URL: https://chromiumcodereview.appspot.com/10543106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_server_socket_openssl.cc')
| -rw-r--r-- | net/socket/ssl_server_socket_openssl.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc index 8dc1b9c0..e0cf8bc 100644 --- a/net/socket/ssl_server_socket_openssl.cc +++ b/net/socket/ssl_server_socket_openssl.cc @@ -1,15 +1,21 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. #include "base/logging.h" #include "net/socket/ssl_server_socket.h" +// TODO(bulach): Provide simple stubs for EnableSSLServerSockets and +// CreateSSLServerSocket so that when building for OpenSSL rather than NSS, +// so that the code using SSL server sockets can be compiled and disabled +// programatically rather than requiring to be carved out from the compile. + namespace net { -// TODO(bulach): Rather than disable components which call -// CreateSSLServerSocket when building for OpenSSL rather than NSS, just -// provide a stub for it for now. +void EnableSSLServerSockets() { + NOTIMPLEMENTED(); +} + SSLServerSocket* CreateSSLServerSocket(StreamSocket* socket, X509Certificate* certificate, crypto::RSAPrivateKey* key, |