Update net/third_party/nss to NSS_3_15_5_BETA2.

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246110

[agl, 2014-01-21 15:56:50]

lgtm

[commit-bot: I haz the power, 2014-01-21 17:52:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wtc@chromium.org/142283002/170001

[commit-bot: I haz the power, 2014-01-21 21:06:53]

Change committed as 246110

[wtc, 2014-02-12 15:26:24]

Adam:

Please ignore the following comments. These are notes to myself.

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
File net/third_party/nss/ssl/ssl.h (right):

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
net/third_party/nss/ssl/ssl.h:165: /* SSL_ENABLE_NPN controls whether the NPN
extension is enabled for the initial

Define "NPN".

Should we say "SSL_ENABLE_NEXT_PROTO_NEGO"?

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
net/third_party/nss/ssl/ssl.h:173: /* SSL_ENABLE_ALPN controls whether the ALPN
extension is enabled for the

Define "APLN".

Should we say "SSL_ENABLE_APP_LAYER_PROTO_NEGO"?

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
File net/third_party/nss/ssl/ssl3ext.c (right):

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
net/third_party/nss/ssl/ssl3ext.c:633: if (ssl3_ExtensionNegotiated(ss,
ssl_app_layer_protocol_xtn)) {

As an optimization, check ss->opt.enableALPN first.

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
net/third_party/nss/ssl/ssl3ext.c:639: PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);

Use a different error code. This is not an NSS bug. This is a server bug.

https://codereview.chromium.org/142283002/diff/170001/net/third_party/nss/ssl...
net/third_party/nss/ssl/ssl3ext.c:683: if (ssl3_ExtensionNegotiated(ss,
ssl_next_proto_nego_xtn)) {

Add a comment.

As an optimization, check ss->opt.enableNPN first.

Change the error code because this is not an NSS bug. This is a server bug.