Update NSS to 3.21 RTM and NSPR to 4.11 RTM

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.
 
 {
   'variables': {
     'conditions': [
       ['OS=="ios"', {
         'exclude_nss_root_certs%': 0,
         'exclude_nss_libpkix%': 0,
@@ skipping 855 matching lines @@
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.h',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_primhash.c',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_primhash.h',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_rwlock.c',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_rwlock.h',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_string.c',
             'nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_string.h',
             'nss/lib/nss/nss.h',
             'nss/lib/nss/nssinit.c',
+            'nss/lib/nss/nssoptions.c',
+            'nss/lib/nss/nssoptions.h',
             'nss/lib/nss/nssrenam.h',
             'nss/lib/nss/utilwrap.c',
             'nss/lib/pk11wrap/debug_module.c',
             'nss/lib/pk11wrap/dev3hack.c',
             'nss/lib/pk11wrap/dev3hack.h',
             'nss/lib/pk11wrap/pk11akey.c',
             'nss/lib/pk11wrap/pk11auth.c',
             'nss/lib/pk11wrap/pk11cert.c',
             'nss/lib/pk11wrap/pk11cxt.c',
             'nss/lib/pk11wrap/pk11err.c',
@@ skipping 144 matching lines @@
             'nss/lib/util/secport.h',
             'nss/lib/util/sectime.c',
             'nss/lib/util/templates.c',
             'nss/lib/util/utf8.c',
             'nss/lib/util/utilmod.c',
             'nss/lib/util/utilmodt.h',
             'nss/lib/util/utilpars.c',
             'nss/lib/util/utilpars.h',
             'nss/lib/util/utilparst.h',
             'nss/lib/util/utilrename.h',
+            'nss/lib/util/verref.h',
           ],
           'sources!': [
             # mpi_arm.c is included by mpi_arm_mac.c.
             # NOTE: mpi_arm.c can be used directly on Linux. mpi_arm.c will need
             # to be excluded conditionally if we start to build NSS on Linux.
             'nss/lib/freebl/mpi/mpi_arm.c',
             # primes.c is included by mpprime.c.
             'nss/lib/freebl/mpi/primes.c',
             # unix_rand.c and win_rand.c are included by sysrand.c.
             'nss/lib/freebl/unix_rand.c',
@@ skipping 235 matching lines @@
                 # mpi_x86_asm.c contains MSVC inline assembly code.
                 'nss/lib/freebl/mpi/mpi_x86_asm.c',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }