openssl-1.1.1i

Timestamp:

Jan 4, 2021 2:54:24 PM (4 years ago)

Author:

vboxsync

Message:

Forward ported r142071: openssl-1.1.1i build fix for VC++ 2010. bugref:9885

Location:

trunk/src/libs/openssl-1.1.1i

Files:

trunk/src/libs/openssl-1.1.1i

Property svn:mergeinfo

old	new
	1	/branches/VBox-6.1/src/libs/openssl-1.1.1i:142071
1	2	/trunk/src/libs/openssl-1.1.1b:130239-131640
2	3	/trunk/src/libs/openssl-1.1.1c:131725-133540

-              r87083
+              r87167
             infty = (p.p.X[0] | p.p.X[1] | p.p.X[2] | p.p.X[3] |
                      p.p.Y[0] | p.p.Y[1] | p.p.Y[2] | p.p.Y[3]);
+#if !defined(_MSC_VER) || P256_LIMBS != 4 /* vbox: VC++ 2010 complains about out of bounds accesses here in debug builds. */
             if (P256_LIMBS == 8)
                 infty |= (p.p.X[4] | p.p.X[5] | p.p.X[6] | p.p.X[7] |
                           p.p.Y[4] | p.p.Y[5] | p.p.Y[6] | p.p.Y[7]);
+#endif
             infty = 0 - is_zero(infty);
 …
             p.p.Z[2] = ONE[2] & infty;
             p.p.Z[3] = ONE[3] & infty;
+#if !defined(_MSC_VER) || P256_LIMBS != 4 /* vbox: VC++ 2010 complains about out of bounds accesses here in debug builds. */
             if (P256_LIMBS == 8) {
                 p.p.Z[4] = ONE[4] & infty;
 …
                 p.p.Z[7] = ONE[7] & infty;
+            }
+#endif
             for (i = 1; i < 37; i++) {

Note: See TracChangeset for help on using the changeset viewer.