Update NSS to 3.48 while keeping vc2013 hackfix and no-sslkeylogfile intact.

This commit is contained in:
Roy Tam 2020-01-03 13:36:26 +08:00
commit 171849c8e5
351 changed files with 115185 additions and 57946 deletions

View file

@ -13,10 +13,19 @@
'type': 'none',
'dependencies': [
'lib/ckfw/builtins/builtins.gyp:nssckbi',
'lib/freebl/freebl.gyp:freebl3',
'lib/softoken/softoken.gyp:softokn3',
],
'conditions': [
[ 'OS=="solaris" and target_arch=="sparc64"', {
'dependencies': [
'lib/freebl/freebl.gyp:freebl_64int_3',
'lib/freebl/freebl.gyp:freebl_64fpu_3',
],
}, {
'dependencies': [
'lib/freebl/freebl.gyp:freebl3',
],
}],
[ 'moz_fold_libs==0', {
'dependencies': [
'lib/nss/nss.gyp:nss3',
@ -109,6 +118,8 @@
[ 'comm_client==1', {
'dependencies': [
'cmd/smimetools/smimetools.gyp:cmsutil',
'cmd/atob/atob.gyp:atob',
'cmd/btoa/btoa.gyp:btoa',
],
}],
[ 'mozilla_client==0', {
@ -192,6 +203,7 @@
'cmd/tstclnt/tstclnt.gyp:tstclnt',
'cmd/vfychain/vfychain.gyp:vfychain',
'cmd/vfyserv/vfyserv.gyp:vfyserv',
'cmd/mpitests/mpitests.gyp:mpi_tests',
'gtests/certhigh_gtest/certhigh_gtest.gyp:certhigh_gtest',
'gtests/cryptohi_gtest/cryptohi_gtest.gyp:cryptohi_gtest',
'gtests/der_gtest/der_gtest.gyp:der_gtest',
@ -201,11 +213,13 @@
'gtests/freebl_gtest/freebl_gtest.gyp:freebl_gtest',
'gtests/mozpkix_gtest/mozpkix_gtest.gyp:mozpkix_gtest',
'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim',
'gtests/pkcs11testmodule/pkcs11testmodule.gyp:pkcs11testmodule',
'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
'gtests/smime_gtest/smime_gtest.gyp:smime_gtest',
'gtests/softoken_gtest/softoken_gtest.gyp:softoken_gtest',
'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
'gtests/util_gtest/util_gtest.gyp:util_gtest',
'lib/ckfw/builtins/testlib/builtins-testlib.gyp:nssckbi-testlib',
],
'conditions': [
[ 'OS=="linux"', {
@ -223,12 +237,6 @@
'cmd/pkix-errcodes/pkix-errcodes.gyp:pkix-errcodes',
],
}],
[ 'test_build==1', {
'dependencies': [
'cmd/mpitests/mpitests.gyp:mpi_tests',
'gtests/freebl_gtest/freebl_gtest.gyp:freebl_gtest',
],
}],
[ 'disable_fips==0', {
'dependencies': [
'cmd/fipstest/fipstest.gyp:fipstest',