Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/mpi/mpi-priv.h

 /*
  *  mpi-priv.h  - Private header file for MPI 
  *  Arbitrary precision integer arithmetic library
  *
  *  NOTE WELL: the content of this header file is NOT part of the "public"
  *  API for the MPI library, and may change at any time.  
  *  Application programs that use libmpi should NOT include this header file.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ skipping 236 matching lines @@
                                                 mp_size a_len, mp_digit b, 
                                                 mp_digit *c);
 void     MPI_ASM_DECL s_mpv_sqr_add_prop(const mp_digit *a,
                                                 mp_size a_len,
                                                 mp_digit *sqrs);
 
 mp_err   MPI_ASM_DECL s_mpv_div_2dx1d(mp_digit Nhi, mp_digit Nlo,
                             mp_digit divisor, mp_digit *quot, mp_digit *rem);
 
 /* c += a * b * (MP_RADIX ** offset);  */
+/* Callers of this macro should be aware that the return type might vary;
+ * it should be treated as a void function. */
 #define s_mp_mul_d_add_offset(a, b, c, off) \
-(s_mpv_mul_d_add_prop(MP_DIGITS(a), MP_USED(a), b, MP_DIGITS(c) + off), MP_OKAY)
+  s_mpv_mul_d_add_prop(MP_DIGITS(a), MP_USED(a), b, MP_DIGITS(c) + off)
 
 typedef struct {
   mp_int       N;       /* modulus N */
   mp_digit     n0prime; /* n0' = - (n0 ** -1) mod MP_RADIX */
 } mp_mont_modulus;
 
 mp_err s_mp_mul_mont(const mp_int *a, const mp_int *b, mp_int *c, 
                        mp_mont_modulus *mmm);
 mp_err s_mp_redc(mp_int *T, mp_mont_modulus *mmm);
 
 /*
  * s_mpi_getProcessorLineSize() returns the size in bytes of the cache line
  * if a cache exists, or zero if there is no cache. If more than one
  * cache line exists, it should return the smallest line size (which is
  * usually the L1 cache).
  *
  * mp_modexp uses this information to make sure that private key information
  * isn't being leaked through the cache.
  *
  * see mpcpucache.c for the implementation.
  */
 unsigned long s_mpi_getProcessorLineSize();
 
 /* }}} */
 #endif