Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/mpi/mplogic.c

 /*
  *  mplogic.c
  *
  *  Bitwise logical operations on MPI values
  *
  * 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
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mpi-priv.h"
@@ skipping 385 matching lines @@
     mask &= ((digit[0] >> rshift) | (digit[1] << (MP_DIGIT_BIT - rshift)));
   }
   return (mp_err)mask;
 }
 
 /*
   mpl_significant_bits
   returns number of significnant bits in abs(a).
   returns 1 if value is zero.
  */
-mp_err mpl_significant_bits(const mp_int *a)
+mp_size mpl_significant_bits(const mp_int *a)
 {
-  mp_err bits   = 0;
+  mp_size bits = 0;
   int    ix;
 
   ARGCHK(a != NULL, MP_BADARG);
 
   ix = MP_USED(a);
   for (ix = MP_USED(a); ix > 0; ) {
     mp_digit d;
     d = MP_DIGIT(a, --ix);
     if (d) {
       while (d) {
         ++bits;
         d >>= 1;
       }
       break;
     }
   }
   bits += ix * MP_DIGIT_BIT;
   if (!bits)
     bits = 1;
   return bits;
 }
 
 /*------------------------------------------------------------------------*/
 /* HERE THERE BE DRAGONS                                                  */