Update NSS to 3.21 RTM and NSPR to 4.11 RTM

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"
@@ skipping 1236 matching lines @@
 /* BYTESWAP_MP_DIGIT_TO_LE swaps the bytes of a mp_digit to
  * little-endian order.
  */
 #ifdef IS_BIG_ENDIAN
 #ifdef __APPLE__
 #include <libkern/OSByteOrder.h>
 #define BYTESWAP32(x) OSSwapInt32(x)
 #define BYTESWAP64(x) OSSwapInt64(x)
 #else
 #define BYTESWAP32(x) \
-    ((x) >> 24 | (x) >> 8 & 0xff00 | ((x) & 0xff00) << 8 | (x) << 24)
+    (((x) >> 24) | (((x) >> 8) & 0xff00) | (((x) & 0xff00) << 8) | ((x) << 24))
 #define BYTESWAP64(x) \
-    ((x) >> 56 | (x) >> 40 & 0xff00 | \
-     (x) >> 24 & 0xff0000 | (x) >> 8 & 0xff000000 | \
-     ((x) & 0xff000000) << 8 | ((x) & 0xff0000) << 24 | \
-     ((x) & 0xff00) << 40 | (x) << 56)
+    (((x) >> 56) | (((x) >> 40) & 0xff00) | \
+     (((x) >> 24) & 0xff0000) | (((x) >> 8) & 0xff000000) | \
+     (((x) & 0xff000000) << 8) | (((x) & 0xff0000) << 24) | \
+     (((x) & 0xff00) << 40) | ((x) << 56))
 #endif
 
 #ifdef MP_USE_UINT_DIGIT
 #define BYTESWAP_MP_DIGIT_TO_LE(x) BYTESWAP32(x)
 #else
 #define BYTESWAP_MP_DIGIT_TO_LE(x) BYTESWAP64(x)
 #endif
 #endif /* IS_BIG_ENDIAN */
 
 #ifdef MP_USE_UINT_DIGIT
@@ skipping 222 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;
 }