Update NSS to NSS_3_15_BETA2.

nss/lib/freebl/ecl/ecp_256_32.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/. */
 
 /* A 32-bit implementation of the NIST P-256 elliptic curve. */
 
 #include <string.h>
 
 #include "prtypes.h"
 #include "mpi.h"
 #include "mpi-priv.h"
 #include "ecp.h"
-#include "secport.h"
 
 typedef PRUint8 u8;
 typedef PRUint32 u32;
 typedef PRUint64 u64;
 
 /* Our field elements are represented as nine, unsigned 32-bit words. Freebl's
  * MPI library calls them digits, but here they are called limbs, which is
  * GMP's terminology.
  *
  * The value of an felem (field element) is:
@@ skipping 1334 matching lines @@
 }
 
 /* scalar_from_mp_int sets out_scalar=n, where n < the group order. */
 static void scalar_from_mp_int(u8 out_scalar[32], const mp_int *n)
 {
     /* We require that |n| is less than the order of the group and therefore it
      * will fit into |out_scalar|. However, these is a timing side-channel here
      * that we cannot avoid: if |n| is sufficiently small it may be one or more
      * words too short and we'll copy less data.
      */
-    PORT_Assert(MP_USED(n) * sizeof(mp_digit) <= 32);
     memset(out_scalar, 0, 32);
 #ifdef IS_LITTLE_ENDIAN
     memcpy(out_scalar, MP_DIGITS(n), MP_USED(n) * sizeof(mp_digit));
 #else
     {
         mp_size i;
         mp_digit swapped[MP_DIGITS_IN_256_BITS];
         for (i = 0; i < MP_USED(n); i++) {
             swapped[i] = BYTESWAP_MP_DIGIT_TO_LE(MP_DIGIT(n, i));
         }
@@ skipping 118 matching lines @@
 /* Wire in fast point multiplication for named curves. */
 mp_err ec_group_set_gfp256_32(ECGroup *group, ECCurveName name)
 {
     if (name == ECCurve_NIST_P256) {
         group->base_point_mul = &ec_GFp_nistp256_base_point_mul;
         group->point_mul = &ec_GFp_nistp256_point_mul;
         group->points_mul = &ec_GFp_nistp256_points_mul_vartime;
     }
     return MP_OKAY;
 }