diff options
| author | rkn@chromium.org <rkn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 23:50:34 +0000 |
|---|---|---|
| committer | rkn@chromium.org <rkn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 23:50:34 +0000 |
| commit | 2619d3318502ad7bc1c03f77bf5b699f8350c4c0 (patch) | |
| tree | 763990bf25e893669b4d3f0fab94bc62ae3b086f /net/socket | |
| parent | 351631b199be296f6e6193312b4393a40b0e3b4c (diff) | |
| download | chromium_src-2619d3318502ad7bc1c03f77bf5b699f8350c4c0.zip chromium_src-2619d3318502ad7bc1c03f77bf5b699f8350c4c0.tar.gz chromium_src-2619d3318502ad7bc1c03f77bf5b699f8350c4c0.tar.bz2 | |
Adds command-line switch for TLS origin bound certificate extension.
This extension is disabled by default. To enable, pass in the
command line switch "--enable-ssl-origin-bound-certs".
BUG=88782
TEST=None
Review URL: http://codereview.chromium.org/7460002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 3 | ||||
| -rw-r--r-- | net/socket/ssl_server_socket_unittest.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 18fd378..83e866c 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -957,7 +957,8 @@ int SSLClientSocketNSS::InitializeSSLOptions() { #endif #ifdef SSL_ENABLE_OB_CERTS - rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_OB_CERTS, PR_FALSE); + rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_OB_CERTS, + ssl_config_.origin_bound_certs_enabled); if (rv != SECSuccess) LogFailedNSSFunction(net_log_, "SSL_OptionSet", "SSL_ENABLE_OB_CERTS"); #endif diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index 894bf98..1ab9f63 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -256,6 +256,7 @@ class SSLServerSocketTest : public PlatformTest { net::SSLConfig ssl_config; ssl_config.cached_info_enabled = false; ssl_config.false_start_enabled = false; + ssl_config.origin_bound_certs_enabled = false; ssl_config.ssl3_enabled = true; ssl_config.tls1_enabled = true; |