Changeset 86562 in vbox for trunk/src

Timestamp:

Oct 14, 2020 8:15:56 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140911

Message:

openssl-1.1.1h: rolling back our changes, restoring crypto/ec/ecp_nistz256.c to the original from 1.1.1h. bugref:9847

File:

• trunk/src/libs/openssl-1.1.1h/crypto/ec/ecp_nistz256.c (modified) (8 diffs)

trunk/src/libs/openssl-1.1.1h/crypto/ec/ecp_nistz256.c

@@ -179 +179 @@
     dst[2] = (src[2] & mask1) ^ (dst[2] & mask2);
     dst[3] = (src[3] & mask1) ^ (dst[3] & mask2);
-#if P256_LIMBS == 8
+    if (P256_LIMBS == 8) {
         dst[4] = (src[4] & mask1) ^ (dst[4] & mask2);
         dst[5] = (src[5] & mask1) ^ (dst[5] & mask2);
         dst[6] = (src[6] & mask1) ^ (dst[6] & mask2);
         dst[7] = (src[7] & mask1) ^ (dst[7] & mask2);
-#endif
+    }
 }
 
@@ -204 +204 @@
     res |= a[2] ^ b[2];
     res |= a[3] ^ b[3];
-#if P256_LIMBS == 8
+    if (P256_LIMBS == 8) {
         res |= a[4] ^ b[4];
         res |= a[5] ^ b[5];
         res |= a[6] ^ b[6];
         res |= a[7] ^ b[7];
-#endif
+    }
 
     return is_zero(res);
@@ -224 +224 @@
         res |= a[2] ^ ONE[2];
         res |= a[3] ^ ONE[3];
-#if P256_LIMBS == 8
+        if (P256_LIMBS == 8) {
             res |= a[4] ^ ONE[4];
             res |= a[5] ^ ONE[5];
@@ -232 +232 @@
              * because value of "one" takes only 7 limbs.
              */
-#endif
+        }
         res = is_zero(res);
     }
@@ -334 +334 @@
      */
     in1infty = (in1_z[0] | in1_z[1] | in1_z[2] | in1_z[3]);
-#if P256_LIMBS == 8
+    if (P256_LIMBS == 8)
         in1infty |= (in1_z[4] | in1_z[5] | in1_z[6] | in1_z[7]);
-#endif
 
     in2infty = (in2_z[0] | in2_z[1] | in2_z[2] | in2_z[3]);
-#if P256_LIMBS == 8
+    if (P256_LIMBS == 8)
         in2infty |= (in2_z[4] | in2_z[5] | in2_z[6] | in2_z[7]);
-#endif
 
     in1infty = is_zero(in1infty);
@@ -464 +462 @@
      */
     in1infty = (in1_z[0] | in1_z[1] | in1_z[2] | in1_z[3]);
-#if P256_LIMBS == 8
+    if (P256_LIMBS == 8)
         in1infty |= (in1_z[4] | in1_z[5] | in1_z[6] | in1_z[7]);
-#endif
 
     /*
@@ -474 +471 @@
     in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |
                 in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);
-#if P256_LIMBS == 8
+    if (P256_LIMBS == 8)
         in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |
                      in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);
-#endif
 
     in1infty = is_zero(in1infty);
@@ -1081 +1077 @@
             infty = 0 - is_zero(infty);
             infty = ~infty;
-#endif
 
             p.p.Z[0] = ONE[0] & infty;