Update NSS to 3.21 RTM and NSPR to 4.11 RTM

Update NSS to 3.21 RTM and NSPR to 4.11 RTM

This updates the bundled version of NSS (used on iOS) to NSS 3.21,
with NSPR updated to 4.11.

BUG=568855
R=davidben@chromium.org

Committed: https://chromium.googlesource.com/chromium/deps/nss/+/c339081e4a5720acaff8a8399110ab9f6f3ccaf5

Committed: https://chromium.googlesource.com/chromium/deps/nss/+/aee1b12a9a40d11e435c4c5706d55c4af24df2af

[Ryan Sleevi, 2015-12-11 01:07:56]

rsleevi@chromium.org changed reviewers:
+ davidben@chromium.org

[Ryan Sleevi, 2015-12-11 01:07:56]

David:

Mind looking through this?

Among other things, this brings in EMS support for NSS. It also redoes how the
premaster secret is calculated (unsurprisingly). It should be fairly easy to
look through the diffs and see if anything surprises/shocks you - most of what
went into 3.21 was error cleanups.

[Ryan Sleevi, 2015-12-11 01:26:14]

I should have mentioned there was also some ECC math fixes, if you care.

(And a new options API for configuring minimums, but that's soft-launched)

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/dh.c
File nss/lib/freebl/dh.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/dh.c#newcode257
nss/lib/freebl/dh.c:257: * We check to make sure that ZZ is not equal to 1 or -1
mod p.
Of interest

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ec.c
File nss/lib/freebl/ec.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ec.c#newcode550
nss/lib/freebl/ec.c:550: if (ec_point_at_infinity(publicValue)) {
Of interest

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ecl/ecp_jac.c
File nss/lib/freebl/ecl/ecp_jac.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ecl/ecp_jac....
nss/lib/freebl/ecl/ecp_jac.c:148: /* P == Q or P == -Q */
Of interest; correctness fix

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ecl/ecp_jac....
nss/lib/freebl/ecl/ecp_jac.c:222: /* P == inf or P == -P */
Another correctness fix

[davidben, 2015-12-11 22:10:58]

lgtm. I mostly only glossed over things. Did look into the two "Of interest"
chunks. It looks like they're both pointless, which is not surprising given the
bug they came from.

https://codereview.chromium.org/1504923011/diff/1/README.chromium
File README.chromium (right):

https://codereview.chromium.org/1504923011/diff/1/README.chromium#newcode45
README.chromium:45: - patches/nspr-unused-variable.patch: Remove an unused
variable. See NSPR
I think this patch fell off a while ago.

https://codereview.chromium.org/1504923011/diff/1/nss/lib/certdb/crl.c
File nss/lib/certdb/crl.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/certdb/crl.c#newcod...
nss/lib/certdb/crl.c:3090: NamedCRLCacheEntry_Destroy(newEntry);
[Why didn't they PORT_CheckSuccess this one too? Oh well, whatever.]

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/dh.c
File nss/lib/freebl/dh.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/dh.c#newcode257
nss/lib/freebl/dh.c:257: * We check to make sure that ZZ is not equal to 1 or -1
mod p.
On 2015/12/11 01:26:14, Ryan Sleevi wrote:
> Of interest

Meh. https://crbug.com/482950.

If I'm understanding this right (certainly possible), this is especially absurd
because they already do a check in line 231 that, assuming you're using a safe
prime, throws out points on small subgroups. And if it's not a safe prime, this
check isn't even sufficient because there would then be other points on the
small subgroup.

NSS's bug is here:
https://bugzilla.mozilla.org/show_bug.cgi?id=1160139
And the reporter (same person who filed the bug on our end) specifically wants a
1 mod 4 prime which cannot be a safe prime. A safe prime is always going to be 3
mod 4.

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ec.c
File nss/lib/freebl/ec.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ec.c#newcode550
nss/lib/freebl/ec.c:550: if (ec_point_at_infinity(publicValue)) {
On 2015/12/11 01:26:14, Ryan Sleevi wrote:
> Of interest

Pretty sure this was a no-op since then pointQ would have been infinity and line
576 would have tripped it up. ECDH can't handle the point at infinity as an
output to begin with. But okay.

This also came from https://bugzilla.mozilla.org/show_bug.cgi?id=1160139, so I'm
not surprised.

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ecl/ecp_jac.c
File nss/lib/freebl/ecl/ecp_jac.c (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ecl/ecp_jac....
nss/lib/freebl/ecl/ecp_jac.c:148: /* P == Q or P == -Q */
On 2015/12/11 01:26:14, Ryan Sleevi wrote:
> Of interest; correctness fix

I don't really know this math well enough to be able to review it or judge
impact.

https://bugzilla.mozilla.org/show_bug.cgi?id=1125025 doesn't seem to think it
affects TLS.

https://codereview.chromium.org/1504923011/diff/1/nss/lib/freebl/ecl/ecp_jac....
nss/lib/freebl/ecl/ecp_jac.c:222: /* P == inf or P == -P */
On 2015/12/11 01:26:14, Ryan Sleevi wrote:
> Another correctness fix

Ditto.

https://codereview.chromium.org/1504923011/diff/1/nss/lib/util/pkcs11n.h
File nss/lib/util/pkcs11n.h (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/util/pkcs11n.h#newc...
nss/lib/util/pkcs11n.h:224: #define CKM_NSS_CHACHA20_POLY1305              
(CKM_NSS + 28)
I assume we have no more consumers of these symbols that cared about ABI
stability?

(Did we ever? I dunno if we shipped the CHACHA20_POLY1305 patch on CrOS. I guess
CrOS hopefully doesn't mismatch the system headers and Chrome? Meh. Not a
problem now with the chimera.)

[Ryan Sleevi, 2015-12-11 22:20:44]

https://codereview.chromium.org/1504923011/diff/1/nss/lib/util/pkcs11n.h
File nss/lib/util/pkcs11n.h (right):

https://codereview.chromium.org/1504923011/diff/1/nss/lib/util/pkcs11n.h#newc...
nss/lib/util/pkcs11n.h:224: #define CKM_NSS_CHACHA20_POLY1305              
(CKM_NSS + 28)
On 2015/12/11 22:10:58, davidben wrote:
> I assume we have no more consumers of these symbols that cared about ABI
> stability?
> 
> (Did we ever? I dunno if we shipped the CHACHA20_POLY1305 patch on CrOS. I
guess
> CrOS hopefully doesn't mismatch the system headers and Chrome? Meh. Not a
> problem now with the chimera.)

We actually don't ship the CHACHA20_POLY1305 patch on CrOS. That used to be
something that I wanted to work on, but didn't precisely because of the
ABI/landing timing issues.

I still want to land the CrOS fixes first and will be sending those out later
today :)

[Ryan Sleevi, 2015-12-17 21:51:26]

Description was changed from

==========
Update NSS to 3.21 RTM and NSPR to 4.11 RTM

This updates the bundled version of NSS (used on iOS) to NSS 3.21,
with NSPR updated to 4.11.

BUG=568855
==========

to

==========
Update NSS to 3.21 RTM and NSPR to 4.11 RTM

This updates the bundled version of NSS (used on iOS) to NSS 3.21,
with NSPR updated to 4.11.

BUG=568855
R=davidben@chromium.org

Committed:
https://chromium.googlesource.com/chromium/deps/nss/+/c339081e4a5720acaff8a83...
==========

[Ryan Sleevi, 2015-12-17 21:51:28]

Committed patchset #1 (id:1) manually as
c339081e4a5720acaff8a8399110ab9f6f3ccaf5 (presubmit successful).

[Ryan Sleevi, 2015-12-18 23:25:41]

Description was changed from

==========
Update NSS to 3.21 RTM and NSPR to 4.11 RTM

This updates the bundled version of NSS (used on iOS) to NSS 3.21,
with NSPR updated to 4.11.

BUG=568855
R=davidben@chromium.org

Committed:
https://chromium.googlesource.com/chromium/deps/nss/+/c339081e4a5720acaff8a83...
==========

to

==========
Update NSS to 3.21 RTM and NSPR to 4.11 RTM

This updates the bundled version of NSS (used on iOS) to NSS 3.21,
with NSPR updated to 4.11.

BUG=568855
R=davidben@chromium.org

Committed:
https://chromium.googlesource.com/chromium/deps/nss/+/c339081e4a5720acaff8a83...

Committed:
https://chromium.googlesource.com/chromium/deps/nss/+/aee1b12a9a40d11e435c4c5...
==========

[Ryan Sleevi, 2015-12-18 23:25:42]

Committed patchset #1 (id:1) manually as
aee1b12a9a40d11e435c4c5706d55c4af24df2af (presubmit successful).