Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Issue 1844813002: Uprev NSS to 3.23 on iOS (Closed)

Created:
4 years, 8 months ago by Ryan Sleevi
Modified:
4 years, 8 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, davidben
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Uprev NSS to 3.23 on iOS R=svaldez@chromium.org BUG=600619 Committed: https://crrev.com/c8191e72b96b9007695a9852142d6331ac22632d Cr-Commit-Position: refs/heads/master@{#385370}

Patch Set 1 #

Total comments: 10

Patch Set 2 : Update patches #

Total comments: 2

Patch Set 3 : Rebased on CL 1854273002 to pass unit tests #

Patch Set 4 : Update DEPS #

Patch Set 5 : Fix GN build & fix ODR violation #

Patch Set 6 : Diff against the right branch #

Patch Set 7 : One more GN fix #

Unified diffs Side-by-side diffs Delta from patch set Stats (+22759 lines, -21316 lines) Patch
M DEPS View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M build/secondary/third_party/nss/BUILD.gn View 1 2 3 4 5 6 21 chunks +203 lines, -483 lines 0 comments Download
M net/socket/nss_ssl_util.cc View 1 2 3 4 5 6 1 chunk +3 lines, -2 lines 0 comments Download
M net/third_party/nss/README.chromium View 1 2 3 4 5 6 6 chunks +5 lines, -42 lines 0 comments Download
D net/third_party/nss/patches/aesgcmchromium.patch View 1 2 3 4 5 6 1 chunk +0 lines, -121 lines 0 comments Download
M net/third_party/nss/patches/applypatches.sh View 1 2 3 4 5 6 2 chunks +2 lines, -16 lines 0 comments Download
M net/third_party/nss/patches/cachecerts.patch View 1 2 3 4 5 6 6 chunks +50 lines, -50 lines 0 comments Download
M net/third_party/nss/patches/cachelocks.patch View 1 2 3 4 5 6 13 chunks +43 lines, -41 lines 0 comments Download
D net/third_party/nss/patches/chacha20poly1305.patch View 1 2 3 4 5 6 1 chunk +0 lines, -285 lines 0 comments Download
M net/third_party/nss/patches/channelid.patch View 1 2 3 4 5 6 20 chunks +275 lines, -272 lines 0 comments Download
M net/third_party/nss/patches/cipherorder.patch View 1 2 3 4 5 6 6 chunks +32 lines, -32 lines 0 comments Download
D net/third_party/nss/patches/clientauth.patch View 1 2 3 4 5 6 1 chunk +0 lines, -457 lines 0 comments Download
M net/third_party/nss/patches/didhandshakeresume.patch View 1 2 3 4 5 6 2 chunks +9 lines, -8 lines 0 comments Download
M net/third_party/nss/patches/getrequestedclientcerttypes.patch View 1 2 3 4 5 6 2 chunks +33 lines, -31 lines 0 comments Download
A net/third_party/nss/patches/nobypass.patch View 1 2 3 4 5 6 1 chunk +20 lines, -0 lines 0 comments Download
D net/third_party/nss/patches/nssrwlock.patch View 1 2 3 4 5 6 1 chunk +0 lines, -238 lines 0 comments Download
M net/third_party/nss/patches/reorderextensions.patch View 1 2 3 4 5 6 1 chunk +18 lines, -13 lines 0 comments Download
M net/third_party/nss/patches/restartclientauth.patch View 1 2 3 4 5 6 5 chunks +70 lines, -70 lines 0 comments Download
D net/third_party/nss/patches/secitemarray.patch View 1 2 3 4 5 6 1 chunk +0 lines, -44 lines 0 comments Download
M net/third_party/nss/patches/secretexporterlocks.patch View 1 2 3 4 5 6 1 chunk +13 lines, -22 lines 0 comments Download
M net/third_party/nss/patches/sessioncache.patch View 1 2 3 4 5 6 4 chunks +23 lines, -23 lines 0 comments Download
D net/third_party/nss/patches/signedcertificatetimestamps.patch View 1 2 3 4 5 6 1 chunk +0 lines, -355 lines 0 comments Download
D net/third_party/nss/patches/suitebonly.patch View 1 2 3 4 5 6 1 chunk +0 lines, -22 lines 0 comments Download
D net/third_party/nss/patches/tls12chromium.patch View 1 2 3 4 5 6 1 chunk +0 lines, -104 lines 0 comments Download
M net/third_party/nss/patches/tlsunique.patch View 1 2 3 4 5 6 4 chunks +43 lines, -41 lines 0 comments Download
M net/third_party/nss/ssl.gyp View 1 2 3 4 5 6 5 chunks +7 lines, -78 lines 0 comments Download
M net/third_party/nss/ssl/BUILD.gn View 1 2 3 4 5 6 6 chunks +6 lines, -38 lines 0 comments Download
M net/third_party/nss/ssl/SSLerrs.h View 1 2 3 4 5 6 1 chunk +289 lines, -264 lines 0 comments Download
M net/third_party/nss/ssl/authcert.c View 1 2 3 4 5 6 1 chunk +62 lines, -62 lines 0 comments Download
D net/third_party/nss/ssl/bodge/nssrenam.h View 1 2 3 4 5 6 1 chunk +0 lines, -47 lines 0 comments Download
D net/third_party/nss/ssl/bodge/secitem_array.c View 1 2 3 4 5 6 1 chunk +0 lines, -151 lines 0 comments Download
M net/third_party/nss/ssl/cmpcert.c View 1 2 3 4 5 6 1 chunk +60 lines, -61 lines 0 comments Download
M net/third_party/nss/ssl/derive.c View 1 2 3 4 5 6 8 chunks +644 lines, -644 lines 0 comments Download
M net/third_party/nss/ssl/dtlscon.c View 1 2 3 4 5 6 24 chunks +120 lines, -71 lines 0 comments Download
D net/third_party/nss/ssl/exports_win.def View 1 2 3 4 5 6 1 chunk +0 lines, -66 lines 0 comments Download
M net/third_party/nss/ssl/manifest.mn View 1 2 3 4 5 6 1 chunk +2 lines, -0 lines 0 comments Download
M net/third_party/nss/ssl/notes.txt View 1 2 3 4 5 6 3 chunks +67 lines, -67 lines 0 comments Download
M net/third_party/nss/ssl/os2_err.h View 1 2 3 4 5 6 1 chunk +2 lines, -2 lines 0 comments Download
M net/third_party/nss/ssl/os2_err.c View 1 2 3 4 5 6 4 chunks +125 lines, -75 lines 0 comments Download
M net/third_party/nss/ssl/preenc.h View 1 2 3 4 5 6 1 chunk +56 lines, -56 lines 0 comments Download
M net/third_party/nss/ssl/prelib.c View 1 2 3 4 5 6 1 chunk +6 lines, -6 lines 0 comments Download
M net/third_party/nss/ssl/ssl.h View 1 2 3 4 5 6 39 chunks +239 lines, -251 lines 0 comments Download
M net/third_party/nss/ssl/ssl3con.c View 1 2 3 4 5 6 257 chunks +7578 lines, -7105 lines 0 comments Download
M net/third_party/nss/ssl/ssl3ecc.c View 1 2 3 4 5 6 52 chunks +500 lines, -319 lines 0 comments Download
M net/third_party/nss/ssl/ssl3ext.c View 1 2 3 4 5 6 90 chunks +1017 lines, -550 lines 0 comments Download
M net/third_party/nss/ssl/ssl3gthr.c View 1 2 3 4 5 6 12 chunks +268 lines, -265 lines 0 comments Download
M net/third_party/nss/ssl/ssl3prot.h View 1 2 3 4 5 6 7 chunks +101 lines, -122 lines 0 comments Download
M net/third_party/nss/ssl/sslauth.c View 1 2 3 4 5 6 8 chunks +131 lines, -148 lines 0 comments Download
M net/third_party/nss/ssl/sslcon.c View 1 2 3 4 5 6 70 chunks +1857 lines, -1850 lines 0 comments Download
M net/third_party/nss/ssl/ssldef.c View 1 2 3 4 5 6 9 chunks +80 lines, -66 lines 0 comments Download
M net/third_party/nss/ssl/sslenum.c View 1 2 3 4 5 6 5 chunks +10 lines, -11 lines 0 comments Download
M net/third_party/nss/ssl/sslerr.h View 1 2 3 4 5 6 2 chunks +212 lines, -197 lines 0 comments Download
M net/third_party/nss/ssl/sslerr.c View 1 2 3 4 5 6 2 chunks +16 lines, -16 lines 0 comments Download
M net/third_party/nss/ssl/sslerrstrs.c View 1 2 3 4 5 6 2 chunks +7 lines, -5 lines 0 comments Download
M net/third_party/nss/ssl/sslgathr.c View 1 2 3 4 5 6 8 chunks +298 lines, -302 lines 0 comments Download
M net/third_party/nss/ssl/sslimpl.h View 1 2 3 4 5 6 38 chunks +1106 lines, -1027 lines 0 comments Download
M net/third_party/nss/ssl/sslinfo.c View 1 2 3 4 5 6 10 chunks +240 lines, -226 lines 0 comments Download
M net/third_party/nss/ssl/sslinit.c View 1 2 3 4 5 6 1 chunk +36 lines, -10 lines 0 comments Download
M net/third_party/nss/ssl/sslmutex.h View 1 2 3 4 5 6 6 chunks +28 lines, -30 lines 0 comments Download
M net/third_party/nss/ssl/sslmutex.c View 1 2 3 4 5 6 25 chunks +170 lines, -163 lines 0 comments Download
M net/third_party/nss/ssl/sslnonce.c View 1 2 3 4 5 6 17 chunks +154 lines, -157 lines 0 comments Download
D net/third_party/nss/ssl/sslplatf.c View 1 2 3 4 5 6 1 chunk +0 lines, -766 lines 0 comments Download
M net/third_party/nss/ssl/sslproto.h View 1 2 3 4 5 6 3 chunks +7 lines, -2 lines 0 comments Download
M net/third_party/nss/ssl/sslreveal.c View 1 2 3 4 5 6 2 chunks +72 lines, -74 lines 0 comments Download
M net/third_party/nss/ssl/sslsecur.c View 1 2 3 4 5 6 55 chunks +641 lines, -639 lines 0 comments Download
M net/third_party/nss/ssl/sslsnce.c View 1 2 3 4 5 6 47 chunks +948 lines, -978 lines 0 comments Download
M net/third_party/nss/ssl/sslsock.c View 1 2 3 4 5 6 98 chunks +1269 lines, -980 lines 0 comments Download
M net/third_party/nss/ssl/sslt.h View 1 2 3 4 5 6 6 chunks +100 lines, -104 lines 0 comments Download
M net/third_party/nss/ssl/ssltrace.c View 1 2 3 4 5 6 3 chunks +156 lines, -161 lines 0 comments Download
A net/third_party/nss/ssl/tls13con.h View 1 2 3 4 5 6 1 chunk +62 lines, -0 lines 0 comments Download
A net/third_party/nss/ssl/tls13con.c View 1 2 3 4 5 6 1 chunk +2059 lines, -0 lines 0 comments Download
A net/third_party/nss/ssl/tls13hkdf.h View 1 2 3 4 5 6 1 chunk +38 lines, -0 lines 0 comments Download
A net/third_party/nss/ssl/tls13hkdf.c View 1 2 3 4 5 6 1 chunk +212 lines, -0 lines 0 comments Download
M net/third_party/nss/ssl/unix_err.h View 1 2 3 4 5 6 1 chunk +2 lines, -2 lines 0 comments Download
M net/third_party/nss/ssl/unix_err.c View 1 2 3 4 5 6 4 chunks +518 lines, -198 lines 0 comments Download
M net/third_party/nss/ssl/win32err.h View 1 2 3 4 5 6 1 chunk +2 lines, -2 lines 0 comments Download
M net/third_party/nss/ssl/win32err.c View 1 2 3 4 5 6 3 chunks +336 lines, -129 lines 0 comments Download

Messages

Total messages: 35 (10 generated)
Ryan Sleevi
rch: for the QUIC changes. Should be a no-op svaldez: Everything else david: FYI I'm ...
4 years, 8 months ago (2016-03-30 02:07:24 UTC) #2
Ryan Sleevi
On 2016/03/30 02:07:24, Ryan Sleevi wrote: > Steven, this is a huge and gross change ...
4 years, 8 months ago (2016-03-30 02:09:05 UTC) #3
davidben
https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 net/quic/crypto/chacha20_poly1305_decrypter_nss.cc:21: : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, Oof, I hadn't realized we actually supported ...
4 years, 8 months ago (2016-03-30 18:39:25 UTC) #5
Ryan Sleevi
https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 net/quic/crypto/chacha20_poly1305_decrypter_nss.cc:21: : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, On 2016/03/30 18:39:25, davidben wrote: > Oof, ...
4 years, 8 months ago (2016-03-31 02:52:58 UTC) #6
Ryan Sleevi
Steven: Patches are now uploaded, which should hopefully make it much easier to review (thankfully, ...
4 years, 8 months ago (2016-03-31 03:40:18 UTC) #7
davidben
https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 net/quic/crypto/chacha20_poly1305_decrypter_nss.cc:21: : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, On 2016/03/31 02:52:58, Ryan Sleevi wrote: > ...
4 years, 8 months ago (2016-03-31 05:23:00 UTC) #8
svaldez
On 2016/03/31 05:23:00, davidben wrote: > https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc > File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): > > https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 > ...
4 years, 8 months ago (2016-03-31 15:30:51 UTC) #9
svaldez
Rough lgtm. The nits are probably not worth doing anything about to prevent more forking/patching. ...
4 years, 8 months ago (2016-04-01 19:50:01 UTC) #10
svaldez
TLS1.3 files seem fine. LGTM.
4 years, 8 months ago (2016-04-01 20:50:24 UTC) #11
Ryan Hamilton
net/quic/ LGTM
4 years, 8 months ago (2016-04-03 23:44:11 UTC) #12
Ryan Sleevi
On 2016/04/03 23:44:11, Ryan Hamilton wrote: > net/quic/ LGTM Rch: Could you please re-read the ...
4 years, 8 months ago (2016-04-04 01:47:15 UTC) #13
Ryan Hamilton
Once this lands, will we be able to implement PSS signing on nSS? https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc File ...
4 years, 8 months ago (2016-04-04 14:37:01 UTC) #14
davidben
https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 net/quic/crypto/chacha20_poly1305_decrypter_nss.cc:21: : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, On 2016/04/04 14:37:01, Ryan Hamilton wrote: > ...
4 years, 8 months ago (2016-04-04 14:55:53 UTC) #15
Ryan Hamilton
https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 net/quic/crypto/chacha20_poly1305_decrypter_nss.cc:21: : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, On 2016/04/04 14:55:52, davidben (OOO 4-4 to ...
4 years, 8 months ago (2016-04-04 16:00:50 UTC) #16
svaldez1
On 2016/04/04 16:00:50, Ryan Hamilton wrote: > https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc > File net/quic/crypto/chacha20_poly1305_decrypter_nss.cc (right): > > https://codereview.chromium.org/1844813002/diff/1/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc#newcode21 ...
4 years, 8 months ago (2016-04-04 17:03:59 UTC) #17
Ryan Sleevi
On 2016/04/01 19:50:01, svaldez wrote: > Rough lgtm. The nits are probably not worth doing ...
4 years, 8 months ago (2016-04-05 03:21:33 UTC) #18
Ryan Sleevi
Rebased onto RCH's https://codereview.chromium.org/1854273002
4 years, 8 months ago (2016-04-05 03:21:48 UTC) #19
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1844813002/30001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1844813002/30001
4 years, 8 months ago (2016-04-05 18:43:09 UTC) #22
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: ios_rel_device_gn on tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_gn/builds/14276)
4 years, 8 months ago (2016-04-05 18:49:37 UTC) #24
Ryan Sleevi
Dirk: Would you be willing to stamp the GN build? We're in the processing of ...
4 years, 8 months ago (2016-04-06 01:33:52 UTC) #25
Ryan Sleevi
OK, for realsy-reals adding Dirk. Hopefully a rubberstamp, see previous comment.
4 years, 8 months ago (2016-04-06 01:34:36 UTC) #27
Dirk Pranke
//build/secondary lgtm.
4 years, 8 months ago (2016-04-06 01:40:59 UTC) #28
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1844813002/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1844813002/60001
4 years, 8 months ago (2016-04-06 02:14:24 UTC) #31
commit-bot: I haz the power
Committed patchset #7 (id:60001)
4 years, 8 months ago (2016-04-06 02:22:49 UTC) #33
commit-bot: I haz the power
4 years, 8 months ago (2016-04-06 02:24:03 UTC) #35
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/c8191e72b96b9007695a9852142d6331ac22632d
Cr-Commit-Position: refs/heads/master@{#385370}

Powered by Google App Engine
This is Rietveld 408576698