Uprev NSS to 3.18 RTM

Uprev NSS to 3.18 RTM

BUG=469516
R=davidben@chromium.org, wtc@chromium.org

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

[Ryan Sleevi, 2015-03-19 01:45:10]

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

[Ryan Sleevi, 2015-03-19 01:45:11]

wtc: Since you volunteered...

[davidben, 2015-03-19 23:35:04]

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

[davidben, 2015-03-19 23:35:04]

lgtm

[wtc, 2015-03-20 00:09:47]

Patch set 2 LGTM.

I assume you figured out how to update certdata.c.

https://codereview.chromium.org/1017413002/diff/20001/README.chromium
File README.chromium (right):

https://codereview.chromium.org/1017413002/diff/20001/README.chromium#newcode68
README.chromium:68: - patches/nss-static.patch: to build NSS as static libraries
and omit

I guess you moved this patch here so that all the patches are listed together.
If so, I suggest we list this patch first, before nss-remove-fortezza.patch,
because this is the biggest/most permanent (in the sense that it is most
difficult to upstream) one among the patches.

https://codereview.chromium.org/1017413002/diff/20001/scripts/nss-checkout.sh
File scripts/nss-checkout.sh (right):

https://codereview.chromium.org/1017413002/diff/20001/scripts/nss-checkout.sh...
scripts/nss-checkout.sh:77: ! -name intel-aes.h ! -name intel-gcm-wrap.c ! -name
intel-gcm.h \
These three files are only used on Linux. Are we going to build NSS from source
code on Linux?

Also, you'd need to add these three source files in this CL to be consistent.

[Ryan Sleevi, 2015-03-20 00:15:36]

https://codereview.chromium.org/1017413002/diff/20001/README.chromium
File README.chromium (right):

https://codereview.chromium.org/1017413002/diff/20001/README.chromium#newcode68
README.chromium:68: - patches/nss-static.patch: to build NSS as static libraries
and omit
On 2015/03/20 00:09:46, wtc wrote:
> 
> I guess you moved this patch here so that all the patches are listed together.
> If so, I suggest we list this patch first, before nss-remove-fortezza.patch,
> because this is the biggest/most permanent (in the sense that it is most
> difficult to upstream) one among the patches.

No, because I forgot to apply it first when merging all the bits. It also made
it easier to track the changes, by merging the small bits first, resolving the
conflicts, and then the larger change.

As you note, because this one is the most likely to create conflicts, any
further conflicts will propagate to the rest of the patches; applying this last
reduces the diff hunk fuzzing of the earlier patches.

https://codereview.chromium.org/1017413002/diff/20001/scripts/nss-checkout.sh
File scripts/nss-checkout.sh (right):

https://codereview.chromium.org/1017413002/diff/20001/scripts/nss-checkout.sh...
scripts/nss-checkout.sh:77: ! -name intel-aes.h ! -name intel-gcm-wrap.c ! -name
intel-gcm.h \
On 2015/03/20 00:09:47, wtc wrote:
> These three files are only used on Linux. Are we going to build NSS from
source
> code on Linux?
> 
> Also, you'd need to add these three source files in this CL to be consistent.

These three files are already part of the tree from a previous CL/uprev. I added
them so that future uprevs won't nuke the files.

I'm just as fine nuking this line and the files.

[wtc, 2015-03-20 17:27:35]

https://codereview.chromium.org/1017413002/diff/20001/scripts/nss-checkout.sh
File scripts/nss-checkout.sh (right):

https://codereview.chromium.org/1017413002/diff/20001/scripts/nss-checkout.sh...
scripts/nss-checkout.sh:77: ! -name intel-aes.h ! -name intel-gcm-wrap.c ! -name
intel-gcm.h \

On 2015/03/20 00:15:36, Ryan Sleevi wrote:
> 
> These three files are already part of the tree from a previous CL/uprev. I
added
> them so that future uprevs won't nuke the files.

I see. I guess either that CL added these three files by mistake, or it added
these files for Dart.

If these files were added for Dart, we should keep this line.

[Ryan Sleevi, 2015-04-03 20:54:12]

The CQ bit was checked by rsleevi@chromium.org

[commit-bot: I haz the power, 2015-04-03 20:56:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-03 20:56:56]

Commit queue rejected this change because it did not recognize the base URL.
Please commit your change manually.

[Ryan Sleevi, 2015-04-03 23:37:46]

Committed patchset #3 (id:40001) manually as 294684 (presubmit successful).