Update NSS to 3.16.4. Updated to Chromium's copy of NSS at revision 291806

dart/runtime/bin/net/nss.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
-# Revision 257452 (this should agree with "nss_rev" in DEPS).
+# Revision 291806 (this should agree with "nss_rev" in DEPS).
 {
   # Added by Dart. All Dart comments refer to the following block or line.
   'includes': [
     '../../tools/gyp/runtime-configurations.gypi',
     '../../tools/gyp/nss_configurations.gypi',
   ],
   'variables': {
     # Added by Dart.
     'nss_directory': '../../../third_party/nss',
     'conditions': [
@@ skipping 297 matching lines @@
           'NO_NSPR_10_SUPPORT',
         ],
         'include_dirs': [
           '<(nss_directory)/nspr/pr/include',
           '<(nss_directory)/nspr/lib/ds',
           '<(nss_directory)/nspr/lib/libc/include',
         ],
       },
       # TODO(wtc): suppress C4244 and C4554 in prdtoa.c.
       'msvs_disabled_warnings': [4018, 4244, 4554, 4267,],
+      'variables': {
+        'clang_warning_flags': [
+          # nspr passes "const char*" through "void*".
+          '-Wno-incompatible-pointer-types',
+          # nspr passes "int*" through "unsigned int*".
+          '-Wno-pointer-sign',
+        ],
+      },
       'conditions': [
         ['OS=="mac" or OS=="ios"', {
           'defines': [
             'XP_UNIX',
             'DARWIN',
             'XP_MACOSX',
             '_PR_PTHREADS',
             'HAVE_BSD_FLOCK',
             'HAVE_CRT_EXTERNS_H',
             'HAVE_DLADDR',
@@ skipping 127 matching lines @@
               'NSPR_STATIC',
             ],
           },
         }],
         ['clang==1', {
           'xcode_settings': {
             'WARNING_CFLAGS': [
               # nspr uses a bunch of deprecated functions (NSLinkModule etc) in
               # prlink.c on mac.
               '-Wno-deprecated-declarations',
-              # nspr passes "const char*" through "void*".
-              '-Wno-incompatible-pointer-types',
-              # nspr passes "int*" through "unsigned int*".
-              '-Wno-pointer-sign',
             ],
           },
-          'cflags': [
-            '-Wno-incompatible-pointer-types',
-            '-Wno-pointer-sign',
-          ],
         }],
       ],
     },
     {
       'target_name': 'nss_dart',  # Added by Dart (the _dart postfix)
       'product_name': 'crnss',
       'type': '<(component)',
       'toolsets':['host','target'],
       'dependencies': [
         'nss_static_dart',  # Added by Dart (the _dart postfix)
@@ skipping 99 matching lines @@
       ],
       'include_dirs': [
         '<(nss_directory)/nss/lib/ckfw',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(nss_directory)/nss/lib/ckfw/builtins',
         ],
       },
     },
+    # Removed by Dart: the target nss_static_avx_dart.
+    # This is an optimization of AES on 32 bit Windows using new
+    # Intel assembly instructions.  Not enabling it on Dart.
     {
       'target_name': 'nss_static_dart',  # Added by Dart (the _dart postfix)
       'type': 'static_library',
       'toolsets':['host','target'],
       # This target is an implementation detail - the public dependencies
       # should be on 'nss'.
       'suppress_wildcard': 1,
       'sources': [
         'os_windows.c',
         '<(nss_directory)/nss/lib/base/arena.c',
@@ skipping 87 matching lines @@
         '<(nss_directory)/nss/lib/freebl/cts.c',
         '<(nss_directory)/nss/lib/freebl/cts.h',
         '<(nss_directory)/nss/lib/freebl/des.c',
         '<(nss_directory)/nss/lib/freebl/des.h',
         '<(nss_directory)/nss/lib/freebl/desblapi.c',
         '<(nss_directory)/nss/lib/freebl/dh.c',
         '<(nss_directory)/nss/lib/freebl/drbg.c',
         '<(nss_directory)/nss/lib/freebl/dsa.c',
         '<(nss_directory)/nss/lib/freebl/ec.c',
         '<(nss_directory)/nss/lib/freebl/ec.h',
+        '<(nss_directory)/nss/lib/freebl/ecdecode.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ec2.h',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl-curve.h',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl-exp.h',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl-priv.h',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl.h',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl_curve.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl_gf.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecl_mult.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp.h',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_256.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_256_32.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_384.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_521.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_aff.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_jac.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_jm.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ecp_mont.c',
         '<(nss_directory)/nss/lib/freebl/ecl/ec_naf.c',
         '<(nss_directory)/nss/lib/freebl/gcm.c',
         '<(nss_directory)/nss/lib/freebl/gcm.h',
+        # Changed by Dart: intel-aes assembly language files dropped.
         '<(nss_directory)/nss/lib/freebl/hmacct.c',
         '<(nss_directory)/nss/lib/freebl/hmacct.h',
         '<(nss_directory)/nss/lib/freebl/jpake.c',
         '<(nss_directory)/nss/lib/freebl/md2.c',
         '<(nss_directory)/nss/lib/freebl/md5.c',
         '<(nss_directory)/nss/lib/freebl/mpi/logtab.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mpcpucache.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mpi-config.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mpi-priv.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mpi.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mpi.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mplogic.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mplogic.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mpmontg.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mpprime.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mpprime.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mp_gf2m-priv.h',
         '<(nss_directory)/nss/lib/freebl/mpi/mp_gf2m.c',
         '<(nss_directory)/nss/lib/freebl/mpi/mp_gf2m.h',
         '<(nss_directory)/nss/lib/freebl/mpi/primes.c',
+        '<(nss_directory)/nss/lib/freebl/nss_build_config_mac.h',
         '<(nss_directory)/nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c',
         '<(nss_directory)/nss/lib/freebl/poly1305/poly1305.c',
         '<(nss_directory)/nss/lib/freebl/poly1305/poly1305.h',
         '<(nss_directory)/nss/lib/freebl/pqg.c',
         '<(nss_directory)/nss/lib/freebl/pqg.h',
         '<(nss_directory)/nss/lib/freebl/rawhash.c',
         '<(nss_directory)/nss/lib/freebl/rijndael.c',
         '<(nss_directory)/nss/lib/freebl/rijndael.h',
         '<(nss_directory)/nss/lib/freebl/rijndael32.tab',
         '<(nss_directory)/nss/lib/freebl/rsa.c',
@@ skipping 242 matching lines @@
         '<(nss_directory)/nss/lib/pki/pkit.h',
         '<(nss_directory)/nss/lib/pki/pkitm.h',
         '<(nss_directory)/nss/lib/pki/symmkey.c',
         '<(nss_directory)/nss/lib/pki/tdcache.c',
         '<(nss_directory)/nss/lib/pki/trustdomain.c',
         '<(nss_directory)/nss/lib/smime/cms.h',
         '<(nss_directory)/nss/lib/smime/cmslocal.h',
         '<(nss_directory)/nss/lib/smime/cmsreclist.h',
         '<(nss_directory)/nss/lib/smime/cmst.h',
         '<(nss_directory)/nss/lib/smime/smime.h',
-        '<(nss_directory)/nss/lib/softoken/ecdecode.c',
         '<(nss_directory)/nss/lib/softoken/fipsaudt.c',
         '<(nss_directory)/nss/lib/softoken/fipstest.c',
         '<(nss_directory)/nss/lib/softoken/fipstokn.c',
         '<(nss_directory)/nss/lib/softoken/jpakesftk.c',
         '<(nss_directory)/nss/lib/softoken/lgglue.c',
         '<(nss_directory)/nss/lib/softoken/lgglue.h',
         '<(nss_directory)/nss/lib/softoken/lowkey.c',
         '<(nss_directory)/nss/lib/softoken/lowkeyi.h',
         '<(nss_directory)/nss/lib/softoken/lowkeyti.h',
         '<(nss_directory)/nss/lib/softoken/lowpbe.c',
@@ skipping 89 matching lines @@
         # primes.c is included by mpprime.c.
         '<(nss_directory)/nss/lib/freebl/mpi/primes.c',
         # unix_rand.c and win_rand.c are included by sysrand.c.
         '<(nss_directory)/nss/lib/freebl/unix_rand.c',
         '<(nss_directory)/nss/lib/freebl/win_rand.c',
         # debug_module.c is included by pk11load.c.
         '<(nss_directory)/nss/lib/pk11wrap/debug_module.c',
       ],
       'dependencies': [
         'nspr_dart',  # Added by Dart (the _dart postfix)
+        # Removed by Dart: nss_static_avx target dependency.
         'sqlite.gyp:sqlite_dart',  # Changed by Dart prefix ../sqllite removed _dart postfix added.
       ],
       'export_dependent_settings': [
         'nspr_dart',  # Added by Dart (the _dart postfix)
       ],
       'defines': [
         'MP_API_COMPATIBLE',
         'NSS_DISABLE_DBM',
         'NSS_STATIC',
         'NSS_USE_STATIC_LIBS',
@@ skipping 52 matching lines @@
           '<(nss_directory)/nss/lib/nss',
           '<(nss_directory)/nss/lib/pk11wrap',
           '<(nss_directory)/nss/lib/pkcs7',
           '<(nss_directory)/nss/lib/pki',
           '<(nss_directory)/nss/lib/smime',
           '<(nss_directory)/nss/lib/softoken',
           '<(nss_directory)/nss/lib/util',
         ],
       },
       'msvs_disabled_warnings': [4018, 4101, 4267, ],
+      'variables': {
+        'clang_warning_flags': [
+          # nss doesn't explicitly cast between different enum types.
+          '-Wno-conversion',
+          # nss passes "const char*" through "void*".
+          '-Wno-incompatible-pointer-types',
+          # nss prefers `a && b || c` over `(a && b) || c`.
+          '-Wno-logical-op-parentheses',
+          # nss doesn't use exhaustive switches on enums
+          '-Wno-switch',
+          # nss has some `unsigned < 0` checks.
+          '-Wno-tautological-compare',
+        ],
+      },
       'conditions': [
         ['exclude_nss_root_certs==1', {
           'defines': [
             'NSS_DISABLE_ROOT_CERTS',
           ],
         }],
         ['exclude_nss_libpkix==1', {
           'defines': [
             'NSS_DISABLE_LIBPKIX',
           ],
@@ skipping 71 matching lines @@
             'HAVE_BSD_FLOCK',
             'SHLIB_SUFFIX=\"dylib\"',
             'SHLIB_PREFIX=\"lib\"',
             'SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"',
           ],
           'sources!': [
             '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
             '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
           ],
           'variables': {
-            'forced_include_file': '<(DEPTH)/third_party/nss/nss/lib/freebl/build_config_mac.h',
+            'forced_include_file': 'nss_build_config_mac.h',
           },
           'xcode_settings': {
             'conditions': [
               ['component == "shared_library"', {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',  # no -fvisibility=hidden
               }],
             ],
             # Define processor architecture specific macros in
             # <(forced_include_file).
             'OTHER_CFLAGS': [
@@ skipping 31 matching lines @@
           #   ['target_arch=="ia32"', {
           #     'defines': [
           #       'NSS_X86_OR_X64',
           #       'NSS_X86',
           #       '_X86_',
           #       'MP_ASSEMBLY_MULTIPLY',
           #       'MP_ASSEMBLY_SQUARE',
           #       'MP_ASSEMBLY_DIV_2DX1D',
           #       'MP_USE_UINT_DIGIT',
           #       'MP_NO_MP_WORD',
+          # Changed by Dart: 'USE_HW_AES' and 'INTEL_GCM' are not enabled.
+          #       'USE_HW_AES',
+          #       'INTEL_GCM',
           #     ],
           #   }],
+          #   'msvs_settings': {
+          #     'MASM': {
+          #       'UseSafeExceptionHandlers': 'true',
+          #     },
+          #   },
           #   ['target_arch=="x64"', {
           #     'defines': [
           #       'NSS_USE_64',
           #       'NSS_X86_OR_X64',
           #       'NSS_X64',
           #       '_AMD64_',
           #       'MP_CHAR_STORE_SLOW',
           #       'MP_IS_LITTLE_ENDIAN',
           #       'WIN64',
           #     ],
           #     'sources!': [
           #       '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
           #       '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
           #     ],
           #    }],
           # ],
         }, { # else: OS!="win"
           'sources!': [
             'os_windows.c',
             # mpi_x86_asm.c contains MSVC inline assembly code.
             '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
           ],
         }],
-        ['clang==1', {
-          'xcode_settings': {
-            'WARNING_CFLAGS': [
-              # nss doesn't explicitly cast between different enum types.
-              '-Wno-conversion',
-              # nss passes "const char*" through "void*".
-              '-Wno-incompatible-pointer-types',
-              # nss prefers `a && b || c` over `(a && b) || c`.
-              '-Wno-logical-op-parentheses',
-              # nss doesn't use exhaustive switches on enums
-              '-Wno-switch',
-              # nss has some `unsigned < 0` checks.
-              '-Wno-tautological-compare',
-            ],
-          },
-          'cflags': [
-            '-Wno-conversion',
-            '-Wno-incompatible-pointer-types',
-            '-Wno-logical-op-parentheses',
-            '-Wno-switch',
-            '-Wno-tautological-compare',
-          ],
-        }],
       ],
     },
   ],
   }]],
 }