diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 21:06:48 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 21:06:48 +0000 |
| commit | 063a520f9f53b2d7af8cfb014e93d45a9368ac7c (patch) | |
| tree | f0956665a1c97984b17dec946c7efc12de5b8849 /net/socket/ssl_client_socket_nss.cc | |
| parent | 389eaeac5a4e3c785014b0a5ea9742bd3f5abe07 (diff) | |
| download | chromium_src-063a520f9f53b2d7af8cfb014e93d45a9368ac7c.zip chromium_src-063a520f9f53b2d7af8cfb014e93d45a9368ac7c.tar.gz chromium_src-063a520f9f53b2d7af8cfb014e93d45a9368ac7c.tar.bz2 | |
Update net/third_party/nss to NSS 3.15.5 Beta 2.
alpn.patch and paddingextension.patch have been committed in the NSS
upstream.
In addition to calling SSL_SetNextProtoNego, the SSL_ENABLE_NPN and
SSL_ENABLE_ALPN options need to be used to control whether each of
NPN and APLN will be negotiated. SSL_ENABLE_NPN is enabled by default,
but we enable it explicitly to be safe.
R=agl@chromium.org
BUG=331625
TEST=none
Review URL: https://codereview.chromium.org/142283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index b46ebbd..d2c9959 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -1003,7 +1003,13 @@ bool SSLClientSocketNSS::Core::Init(PRFileDesc* socket, DCHECK_EQ(dst, wire_protos.get() + wire_length); rv = SSL_SetNextProtoNego(nss_fd_, wire_protos.get(), wire_length); if (rv != SECSuccess) - LogFailedNSSFunction(*weak_net_log_, "SSL_SetNextProtoCallback", ""); + LogFailedNSSFunction(*weak_net_log_, "SSL_SetNextProtoNego", ""); + rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_ALPN, PR_TRUE); + if (rv != SECSuccess) + LogFailedNSSFunction(*weak_net_log_, "SSL_OptionSet", "SSL_ENABLE_ALPN"); + rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_NPN, PR_TRUE); + if (rv != SECSuccess) + LogFailedNSSFunction(*weak_net_log_, "SSL_OptionSet", "SSL_ENABLE_NPN"); } rv = SSL_AuthCertificateHook( |