Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/ecl/ecp_256.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 "mpi.h"
 #include "mplogic.h"
 #include "mpi-priv.h"
 
 /* Fast modular reduction for p256 = 2^256 - 2^224 + 2^192+ 2^96 - 1.  a can be r. 
@@ skipping 50 matching lines @@
                 r0 = MP_DIGIT(a,0);
                 r1 = MP_DIGIT(a,1);
                 r2 = MP_DIGIT(a,2);
                 r3 = MP_DIGIT(a,3);
                 r4 = MP_DIGIT(a,4);
                 r5 = MP_DIGIT(a,5);
                 r6 = MP_DIGIT(a,6);
                 r7 = MP_DIGIT(a,7);
 
                 /* sum 1 */
-                MP_ADD_CARRY(r3, a11, r3, 0,     carry);
-                MP_ADD_CARRY(r4, a12, r4, carry, carry);
-                MP_ADD_CARRY(r5, a13, r5, carry, carry);
-                MP_ADD_CARRY(r6, a14, r6, carry, carry);
-                MP_ADD_CARRY(r7, a15, r7, carry, carry);
-                r8 = carry;
-                MP_ADD_CARRY(r3, a11, r3, 0,     carry);
-                MP_ADD_CARRY(r4, a12, r4, carry, carry);
-                MP_ADD_CARRY(r5, a13, r5, carry, carry);
-                MP_ADD_CARRY(r6, a14, r6, carry, carry);
-                MP_ADD_CARRY(r7, a15, r7, carry, carry);
-                r8 += carry;
+                carry = 0;
+                MP_ADD_CARRY(r3, a11, r3, carry);
+                MP_ADD_CARRY(r4, a12, r4, carry);
+                MP_ADD_CARRY(r5, a13, r5, carry);
+                MP_ADD_CARRY(r6, a14, r6, carry);
+                MP_ADD_CARRY(r7, a15, r7, carry);
+                r8 = carry; carry = 0;
+                MP_ADD_CARRY(r3, a11, r3, carry);
+                MP_ADD_CARRY(r4, a12, r4, carry);
+                MP_ADD_CARRY(r5, a13, r5, carry);
+                MP_ADD_CARRY(r6, a14, r6, carry);
+                MP_ADD_CARRY(r7, a15, r7, carry);
+                r8 += carry; carry = 0;
                 /* sum 2 */
-                MP_ADD_CARRY(r3, a12, r3, 0,     carry);
-                MP_ADD_CARRY(r4, a13, r4, carry, carry);
-                MP_ADD_CARRY(r5, a14, r5, carry, carry);
-                MP_ADD_CARRY(r6, a15, r6, carry, carry);
-                MP_ADD_CARRY(r7,   0, r7, carry, carry);
-                r8 += carry;
+                MP_ADD_CARRY(r3, a12, r3, carry);
+                MP_ADD_CARRY(r4, a13, r4, carry);
+                MP_ADD_CARRY(r5, a14, r5, carry);
+                MP_ADD_CARRY(r6, a15, r6, carry);
+                MP_ADD_CARRY(r7,   0, r7, carry);
+                r8 += carry; carry = 0;
                 /* combine last bottom of sum 3 with second sum 2 */
-                MP_ADD_CARRY(r0, a8,  r0, 0,     carry);
-                MP_ADD_CARRY(r1, a9,  r1, carry, carry);
-                MP_ADD_CARRY(r2, a10, r2, carry, carry);
-                MP_ADD_CARRY(r3, a12, r3, carry, carry);
-                MP_ADD_CARRY(r4, a13, r4, carry, carry);
-                MP_ADD_CARRY(r5, a14, r5, carry, carry);
-                MP_ADD_CARRY(r6, a15, r6, carry, carry);
-                MP_ADD_CARRY(r7, a15, r7, carry, carry); /* from sum 3 */
-                r8 += carry;
+                MP_ADD_CARRY(r0, a8,  r0, carry);
+                MP_ADD_CARRY(r1, a9,  r1, carry);
+                MP_ADD_CARRY(r2, a10, r2, carry);
+                MP_ADD_CARRY(r3, a12, r3, carry);
+                MP_ADD_CARRY(r4, a13, r4, carry);
+                MP_ADD_CARRY(r5, a14, r5, carry);
+                MP_ADD_CARRY(r6, a15, r6, carry);
+                MP_ADD_CARRY(r7, a15, r7, carry); /* from sum 3 */
+                r8 += carry; carry = 0;
                 /* sum 3 (rest of it)*/
-                MP_ADD_CARRY(r6, a14, r6, 0,     carry);
-                MP_ADD_CARRY(r7,   0, r7, carry, carry);
-                r8 += carry;
+                MP_ADD_CARRY(r6, a14, r6, carry);
+                MP_ADD_CARRY(r7,   0, r7, carry);
+                r8 += carry; carry = 0;
                 /* sum 4 (rest of it)*/
-                MP_ADD_CARRY(r0, a9,  r0, 0,     carry);
-                MP_ADD_CARRY(r1, a10, r1, carry, carry);
-                MP_ADD_CARRY(r2, a11, r2, carry, carry);
-                MP_ADD_CARRY(r3, a13, r3, carry, carry);
-                MP_ADD_CARRY(r4, a14, r4, carry, carry);
-                MP_ADD_CARRY(r5, a15, r5, carry, carry);
-                MP_ADD_CARRY(r6, a13, r6, carry, carry);
-                MP_ADD_CARRY(r7, a8,  r7, carry, carry);
-                r8 += carry;
+                MP_ADD_CARRY(r0, a9,  r0, carry);
+                MP_ADD_CARRY(r1, a10, r1, carry);
+                MP_ADD_CARRY(r2, a11, r2, carry);
+                MP_ADD_CARRY(r3, a13, r3, carry);
+                MP_ADD_CARRY(r4, a14, r4, carry);
+                MP_ADD_CARRY(r5, a15, r5, carry);
+                MP_ADD_CARRY(r6, a13, r6, carry);
+                MP_ADD_CARRY(r7, a8,  r7, carry);
+                r8 += carry; carry = 0;
                 /* diff 5 */
-                MP_SUB_BORROW(r0, a11, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a12, r1, carry, carry);
-                MP_SUB_BORROW(r2, a13, r2, carry, carry);
-                MP_SUB_BORROW(r3,   0, r3, carry, carry);
-                MP_SUB_BORROW(r4,   0, r4, carry, carry);
-                MP_SUB_BORROW(r5,   0, r5, carry, carry);
-                MP_SUB_BORROW(r6, a8,  r6, carry, carry);
-                MP_SUB_BORROW(r7, a10, r7, carry, carry);
-                r8 -= carry;
+                MP_SUB_BORROW(r0, a11, r0, carry);
+                MP_SUB_BORROW(r1, a12, r1, carry);
+                MP_SUB_BORROW(r2, a13, r2, carry);
+                MP_SUB_BORROW(r3,   0, r3, carry);
+                MP_SUB_BORROW(r4,   0, r4, carry);
+                MP_SUB_BORROW(r5,   0, r5, carry);
+                MP_SUB_BORROW(r6, a8,  r6, carry);
+                MP_SUB_BORROW(r7, a10, r7, carry);
+                r8 -= carry; carry = 0;
                 /* diff 6 */
-                MP_SUB_BORROW(r0, a12, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a13, r1, carry, carry);
-                MP_SUB_BORROW(r2, a14, r2, carry, carry);
-                MP_SUB_BORROW(r3, a15, r3, carry, carry);
-                MP_SUB_BORROW(r4,   0, r4, carry, carry);
-                MP_SUB_BORROW(r5,   0, r5, carry, carry);
-                MP_SUB_BORROW(r6, a9,  r6, carry, carry);
-                MP_SUB_BORROW(r7, a11, r7, carry, carry);
-                r8 -= carry;
+                MP_SUB_BORROW(r0, a12, r0, carry);
+                MP_SUB_BORROW(r1, a13, r1, carry);
+                MP_SUB_BORROW(r2, a14, r2, carry);
+                MP_SUB_BORROW(r3, a15, r3, carry);
+                MP_SUB_BORROW(r4,   0, r4, carry);
+                MP_SUB_BORROW(r5,   0, r5, carry);
+                MP_SUB_BORROW(r6, a9,  r6, carry);
+                MP_SUB_BORROW(r7, a11, r7, carry);
+                r8 -= carry; carry = 0;
                 /* diff 7 */
-                MP_SUB_BORROW(r0, a13, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a14, r1, carry, carry);
-                MP_SUB_BORROW(r2, a15, r2, carry, carry);
-                MP_SUB_BORROW(r3, a8,  r3, carry, carry);
-                MP_SUB_BORROW(r4, a9,  r4, carry, carry);
-                MP_SUB_BORROW(r5, a10, r5, carry, carry);
-                MP_SUB_BORROW(r6, 0,   r6, carry, carry);
-                MP_SUB_BORROW(r7, a12, r7, carry, carry);
-                r8 -= carry;
+                MP_SUB_BORROW(r0, a13, r0, carry);
+                MP_SUB_BORROW(r1, a14, r1, carry);
+                MP_SUB_BORROW(r2, a15, r2, carry);
+                MP_SUB_BORROW(r3, a8,  r3, carry);
+                MP_SUB_BORROW(r4, a9,  r4, carry);
+                MP_SUB_BORROW(r5, a10, r5, carry);
+                MP_SUB_BORROW(r6, 0,   r6, carry);
+                MP_SUB_BORROW(r7, a12, r7, carry);
+                r8 -= carry; carry = 0;
                 /* diff 8 */
-                MP_SUB_BORROW(r0, a14, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a15, r1, carry, carry);
-                MP_SUB_BORROW(r2, 0,   r2, carry, carry);
-                MP_SUB_BORROW(r3, a9,  r3, carry, carry);
-                MP_SUB_BORROW(r4, a10, r4, carry, carry);
-                MP_SUB_BORROW(r5, a11, r5, carry, carry);
-                MP_SUB_BORROW(r6, 0,   r6, carry, carry);
-                MP_SUB_BORROW(r7, a13, r7, carry, carry);
+                MP_SUB_BORROW(r0, a14, r0, carry);
+                MP_SUB_BORROW(r1, a15, r1, carry);
+                MP_SUB_BORROW(r2, 0,   r2, carry);
+                MP_SUB_BORROW(r3, a9,  r3, carry);
+                MP_SUB_BORROW(r4, a10, r4, carry);
+                MP_SUB_BORROW(r5, a11, r5, carry);
+                MP_SUB_BORROW(r6, 0,   r6, carry);
+                MP_SUB_BORROW(r7, a13, r7, carry);
                 r8 -= carry;
 
                 /* reduce the overflows */
                 while (r8 > 0) {
-                        mp_digit r8_d = r8;
-                        MP_ADD_CARRY(r0, r8_d,         r0, 0,     carry);
-                        MP_ADD_CARRY(r1, 0,            r1, carry, carry);
-                        MP_ADD_CARRY(r2, 0,            r2, carry, carry);
-                        MP_ADD_CARRY(r3, 0-r8_d,       r3, carry, carry);
-                        MP_ADD_CARRY(r4, MP_DIGIT_MAX, r4, carry, carry);
-                        MP_ADD_CARRY(r5, MP_DIGIT_MAX, r5, carry, carry);
-                        MP_ADD_CARRY(r6, 0-(r8_d+1),   r6, carry, carry);
-                        MP_ADD_CARRY(r7, (r8_d-1),     r7, carry, carry);
+                        mp_digit r8_d = r8; carry = 0;
+                        carry = 0;
+                        MP_ADD_CARRY(r0, r8_d,         r0, carry);
+                        MP_ADD_CARRY(r1, 0,            r1, carry);
+                        MP_ADD_CARRY(r2, 0,            r2, carry);
+                        MP_ADD_CARRY(r3, 0-r8_d,       r3, carry);
+                        MP_ADD_CARRY(r4, MP_DIGIT_MAX, r4, carry);
+                        MP_ADD_CARRY(r5, MP_DIGIT_MAX, r5, carry);
+                        MP_ADD_CARRY(r6, 0-(r8_d+1),   r6, carry);
+                        MP_ADD_CARRY(r7, (r8_d-1),     r7, carry);
                         r8 = carry;
                 }
 
                 /* reduce the underflows */
                 while (r8 < 0) {
                         mp_digit r8_d = -r8;
-                        MP_SUB_BORROW(r0, r8_d,         r0, 0,     carry);
-                        MP_SUB_BORROW(r1, 0,            r1, carry, carry);
-                        MP_SUB_BORROW(r2, 0,            r2, carry, carry);
-                        MP_SUB_BORROW(r3, 0-r8_d,       r3, carry, carry);
-                        MP_SUB_BORROW(r4, MP_DIGIT_MAX, r4, carry, carry);
-                        MP_SUB_BORROW(r5, MP_DIGIT_MAX, r5, carry, carry);
-                        MP_SUB_BORROW(r6, 0-(r8_d+1),   r6, carry, carry);
-                        MP_SUB_BORROW(r7, (r8_d-1),     r7, carry, carry);
+                        carry = 0;
+                        MP_SUB_BORROW(r0, r8_d,         r0, carry);
+                        MP_SUB_BORROW(r1, 0,            r1, carry);
+                        MP_SUB_BORROW(r2, 0,            r2, carry);
+                        MP_SUB_BORROW(r3, 0-r8_d,       r3, carry);
+                        MP_SUB_BORROW(r4, MP_DIGIT_MAX, r4, carry);
+                        MP_SUB_BORROW(r5, MP_DIGIT_MAX, r5, carry);
+                        MP_SUB_BORROW(r6, 0-(r8_d+1),   r6, carry);
+                        MP_SUB_BORROW(r7, (r8_d-1),     r7, carry);
                         r8 = 0-carry;
                 }
                 if (a != r) {
                         MP_CHECKOK(s_mp_pad(r,8));
                 }
                 MP_SIGN(r) = MP_ZPOS;
                 MP_USED(r) = 8;
 
                 MP_DIGIT(r,7) = r7;
                 MP_DIGIT(r,6) = r6;
@@ skipping 32 matching lines @@
                 a5l = a5 << 32;
                 a5h = a5 >> 32;
                 a4l = a4 << 32;
                 a4h = a4 >> 32;
                 r3 = MP_DIGIT(a,3);
                 r2 = MP_DIGIT(a,2);
                 r1 = MP_DIGIT(a,1);
                 r0 = MP_DIGIT(a,0);
 
                 /* sum 1 */
-                MP_ADD_CARRY(r1, a5h << 32, r1, 0,     carry);
-                MP_ADD_CARRY(r2, a6,        r2, carry, carry);
-                MP_ADD_CARRY(r3, a7,        r3, carry, carry);
-                r4 = carry;
-                MP_ADD_CARRY(r1, a5h << 32, r1, 0,     carry);
-                MP_ADD_CARRY(r2, a6,        r2, carry, carry);
-                MP_ADD_CARRY(r3, a7,        r3, carry, carry);
-                r4 += carry;
+                carry = 0;
+                carry = 0;
+                MP_ADD_CARRY(r1, a5h << 32, r1, carry);
+                MP_ADD_CARRY(r2, a6,        r2, carry);
+                MP_ADD_CARRY(r3, a7,        r3, carry);
+                r4 = carry; carry = 0;
+                carry = 0;
+                MP_ADD_CARRY(r1, a5h << 32, r1, carry);
+                MP_ADD_CARRY(r2, a6,        r2, carry);
+                MP_ADD_CARRY(r3, a7,        r3, carry);
+                r4 += carry; carry = 0;
                 /* sum 2 */
-                MP_ADD_CARRY(r1, a6l,       r1, 0,     carry);
-                MP_ADD_CARRY(r2, a6h | a7l, r2, carry, carry);
-                MP_ADD_CARRY(r3, a7h,       r3, carry, carry);
-                r4 += carry;
-                MP_ADD_CARRY(r1, a6l,       r1, 0,     carry);
-                MP_ADD_CARRY(r2, a6h | a7l, r2, carry, carry);
-                MP_ADD_CARRY(r3, a7h,       r3, carry, carry);
-                r4 += carry;
+                carry = 0;
+                MP_ADD_CARRY(r1, a6l,       r1, carry);
+                MP_ADD_CARRY(r2, a6h | a7l, r2, carry);
+                MP_ADD_CARRY(r3, a7h,       r3, carry);
+                r4 += carry; carry = 0;
+                carry = 0;
+                MP_ADD_CARRY(r1, a6l,       r1, carry);
+                MP_ADD_CARRY(r2, a6h | a7l, r2, carry);
+                MP_ADD_CARRY(r3, a7h,       r3, carry);
+                r4 += carry; carry = 0;
 
                 /* sum 3 */
-                MP_ADD_CARRY(r0, a4,        r0, 0,     carry);
-                MP_ADD_CARRY(r1, a5l >> 32, r1, carry, carry);
-                MP_ADD_CARRY(r2, 0,         r2, carry, carry);
-                MP_ADD_CARRY(r3, a7,        r3, carry, carry);
-                r4 += carry;
+                carry = 0;
+                MP_ADD_CARRY(r0, a4,        r0, carry);
+                MP_ADD_CARRY(r1, a5l >> 32, r1, carry);
+                MP_ADD_CARRY(r2, 0,         r2, carry);
+                MP_ADD_CARRY(r3, a7,        r3, carry);
+                r4 += carry; carry = 0;
                 /* sum 4 */
-                MP_ADD_CARRY(r0, a4h | a5l,     r0, 0,     carry);
-                MP_ADD_CARRY(r1, a5h|(a6h<<32), r1, carry, carry);
-                MP_ADD_CARRY(r2, a7,            r2, carry, carry);
-                MP_ADD_CARRY(r3, a6h | a4l,     r3, carry, carry);
+                carry = 0;
+                MP_ADD_CARRY(r0, a4h | a5l,     r0, carry);
+                MP_ADD_CARRY(r1, a5h|(a6h<<32), r1, carry);
+                MP_ADD_CARRY(r2, a7,            r2, carry);
+                MP_ADD_CARRY(r3, a6h | a4l,     r3, carry);
                 r4 += carry;
                 /* diff 5 */
-                MP_SUB_BORROW(r0, a5h | a6l,    r0, 0,     carry);
-                MP_SUB_BORROW(r1, a6h,          r1, carry, carry);
-                MP_SUB_BORROW(r2, 0,            r2, carry, carry);
-                MP_SUB_BORROW(r3, (a4l>>32)|a5l,r3, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a5h | a6l,    r0, carry);
+                MP_SUB_BORROW(r1, a6h,          r1, carry);
+                MP_SUB_BORROW(r2, 0,            r2, carry);
+                MP_SUB_BORROW(r3, (a4l>>32)|a5l,r3, carry);
                 r4 -= carry;
                 /* diff 6 */
-                MP_SUB_BORROW(r0, a6,           r0, 0,     carry);
-                MP_SUB_BORROW(r1, a7,           r1, carry, carry);
-                MP_SUB_BORROW(r2, 0,            r2, carry, carry);
-                MP_SUB_BORROW(r3, a4h|(a5h<<32),r3, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a6,           r0, carry);
+                MP_SUB_BORROW(r1, a7,           r1, carry);
+                MP_SUB_BORROW(r2, 0,            r2, carry);
+                MP_SUB_BORROW(r3, a4h|(a5h<<32),r3, carry);
                 r4 -= carry;
                 /* diff 7 */
-                MP_SUB_BORROW(r0, a6h|a7l,      r0, 0,     carry);
-                MP_SUB_BORROW(r1, a7h|a4l,      r1, carry, carry);
-                MP_SUB_BORROW(r2, a4h|a5l,      r2, carry, carry);
-                MP_SUB_BORROW(r3, a6l,          r3, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a6h|a7l,      r0, carry);
+                MP_SUB_BORROW(r1, a7h|a4l,      r1, carry);
+                MP_SUB_BORROW(r2, a4h|a5l,      r2, carry);
+                MP_SUB_BORROW(r3, a6l,          r3, carry);
                 r4 -= carry;
                 /* diff 8 */
-                MP_SUB_BORROW(r0, a7,           r0, 0,     carry);
-                MP_SUB_BORROW(r1, a4h<<32,      r1, carry, carry);
-                MP_SUB_BORROW(r2, a5,           r2, carry, carry);
-                MP_SUB_BORROW(r3, a6h<<32,      r3, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a7,           r0, carry);
+                MP_SUB_BORROW(r1, a4h<<32,      r1, carry);
+                MP_SUB_BORROW(r2, a5,           r2, carry);
+                MP_SUB_BORROW(r3, a6h<<32,      r3, carry);
                 r4 -= carry;
 
                 /* reduce the overflows */
                 while (r4 > 0) {
                         mp_digit r4_long = r4;
                         mp_digit r4l = (r4_long << 32);
-                        MP_ADD_CARRY(r0, r4_long,      r0, 0,     carry);
-                        MP_ADD_CARRY(r1, 0-r4l,        r1, carry, carry);
-                        MP_ADD_CARRY(r2, MP_DIGIT_MAX, r2, carry, carry);
-                        MP_ADD_CARRY(r3, r4l-r4_long-1,r3, carry, carry);
+                        carry = 0;
+                        carry = 0;
+                        MP_ADD_CARRY(r0, r4_long,      r0, carry);
+                        MP_ADD_CARRY(r1, 0-r4l,        r1, carry);
+                        MP_ADD_CARRY(r2, MP_DIGIT_MAX, r2, carry);
+                        MP_ADD_CARRY(r3, r4l-r4_long-1,r3, carry);
                         r4 = carry;
                 }
 
                 /* reduce the underflows */
                 while (r4 < 0) {
                         mp_digit r4_long = -r4;
                         mp_digit r4l = (r4_long << 32);
-                        MP_SUB_BORROW(r0, r4_long,      r0, 0,     carry);
-                        MP_SUB_BORROW(r1, 0-r4l,        r1, carry, carry);
-                        MP_SUB_BORROW(r2, MP_DIGIT_MAX, r2, carry, carry);
-                        MP_SUB_BORROW(r3, r4l-r4_long-1,r3, carry, carry);
+                        carry = 0;
+                        MP_SUB_BORROW(r0, r4_long,      r0, carry);
+                        MP_SUB_BORROW(r1, 0-r4l,        r1, carry);
+                        MP_SUB_BORROW(r2, MP_DIGIT_MAX, r2, carry);
+                        MP_SUB_BORROW(r3, r4l-r4_long-1,r3, carry);
                         r4 = 0-carry;
                 }
 
                 if (a != r) {
                         MP_CHECKOK(s_mp_pad(r,4));
                 }
                 MP_SIGN(r) = MP_ZPOS;
                 MP_USED(r) = 4;
 
                 MP_DIGIT(r,3) = r3;
@@ skipping 52 matching lines @@
 mp_err
 ec_group_set_gfp256(ECGroup *group, ECCurveName name)
 {
         if (name == ECCurve_NIST_P256) {
                 group->meth->field_mod = &ec_GFp_nistp256_mod;
                 group->meth->field_mul = &ec_GFp_nistp256_mul;
                 group->meth->field_sqr = &ec_GFp_nistp256_sqr;
         }
         return MP_OKAY;
 }