Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/ecl/ecl_mult.c

 /* 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.h"
 #include "mplogic.h"
 #include "ecl.h"
 #include "ecl-priv.h"
 #include <stdlib.h>
 
@@ skipping 111 matching lines @@
  * Hankerson, Lopez, Menezes. Software Implementation of the NIST
  * Elliptic Curves over Prime Fields. */
 mp_err
 ec_pts_mul_simul_w2(const mp_int *k1, const mp_int *k2, const mp_int *px,
                                         const mp_int *py, mp_int *rx, mp_int *ry,
                                         const ECGroup *group)
 {
         mp_err res = MP_OKAY;
         mp_int precomp[4][4][2];
         const mp_int *a, *b;
-        int i, j;
+        unsigned int i, j;
         int ai, bi, d;
 
         ARGCHK(group != NULL, MP_BADARG);
         ARGCHK(!((k1 == NULL)
                          && ((k2 == NULL) || (px == NULL)
                                  || (py == NULL))), MP_BADARG);
 
         /* if some arguments are not defined used ECPoint_mul */
         if (k1 == NULL) {
                 return ECPoint_mul(group, k2, px, py, rx, ry);
@@ skipping 86 matching lines @@
                                                          &precomp[i][0][0], &precomp[i][0][1],
                                                          &precomp[i][3][0], &precomp[i][3][1], group));
         }
 
         d = (mpl_significant_bits(a) + 1) / 2;
 
         /* R = inf */
         mp_zero(rx);
         mp_zero(ry);
 
-        for (i = d - 1; i >= 0; i--) {
+        for (i = d; i-- > 0;) {
                 ai = MP_GET_BIT(a, 2 * i + 1);
                 ai <<= 1;
                 ai |= MP_GET_BIT(a, 2 * i);
                 bi = MP_GET_BIT(b, 2 * i + 1);
                 bi <<= 1;
                 bi |= MP_GET_BIT(b, 2 * i);
                 /* R = 2^2 * R */
                 MP_CHECKOK(group->point_dbl(rx, ry, rx, ry, group));
                 MP_CHECKOK(group->point_dbl(rx, ry, rx, ry, group));
                 /* R = R + (ai * A + bi * B) */
@@ skipping 63 matching lines @@
                 res = group->points_mul(k1p, k2p, px, py, rx, ry, group);
         } else {
                 res = ec_pts_mul_simul_w2(k1p, k2p, px, py, rx, ry, group);
         }
 
   CLEANUP:
         mp_clear(&k1t);
         mp_clear(&k2t);
         return res;
 }