Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/ecl/ecp_jm.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 "ecp.h"
 #include "ecl-priv.h"
 #include "mplogic.h"
 #include <stdlib.h>
 
 #define MAX_SCRATCH 6
 
 /* Computes R = 2P.  Elliptic curve points P and R can be identical.  Uses 
  * Modified Jacobian coordinates.
  *
  * Assumes input is already field-encoded using field_enc, and returns 
  * output that is still field-encoded.
  *
  */
-mp_err
+static mp_err
 ec_GFp_pt_dbl_jm(const mp_int *px, const mp_int *py, const mp_int *pz,
                                  const mp_int *paz4, mp_int *rx, mp_int *ry, mp_int *rz,
                                  mp_int *raz4, mp_int scratch[], const ECGroup *group)
 {
         mp_err res = MP_OKAY;
         mp_int *t0, *t1, *M, *S;
 
         t0 = &scratch[0];
         t1 = &scratch[1];
         M = &scratch[2];
@@ skipping 49 matching lines @@
 
   CLEANUP:
         return res;
 }
 
 /* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and Q is
  * (qx, qy, 1).  Elliptic curve points P, Q, and R can all be identical.
  * Uses mixed Modified_Jacobian-affine coordinates. Assumes input is
  * already field-encoded using field_enc, and returns output that is still
  * field-encoded. */
-mp_err
+static mp_err
 ec_GFp_pt_add_jm_aff(const mp_int *px, const mp_int *py, const mp_int *pz,
                                          const mp_int *paz4, const mp_int *qx,
                                          const mp_int *qy, mp_int *rx, mp_int *ry, mp_int *rz,
                                          mp_int *raz4, mp_int scratch[], const ECGroup *group)
 {
         mp_err res = MP_OKAY;
         mp_int *A, *B, *C, *D, *C2, *C3;
 
         A = &scratch[0];
         B = &scratch[1];
@@ skipping 180 matching lines @@
                 mp_clear(&precomp[i][0]);
                 mp_clear(&precomp[i][1]);
         }
         mp_clear(&tpx);
         mp_clear(&tpy);
         mp_clear(&rz);
         mp_clear(&raz4);
         free(naf);
         return res;
 }