Initial support for pluggable public key ASN1 support. Process most public

[openssl.git] / crypto / ec / ectest.c

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index b96feae7f327fb686a4318a095bfff335a79571c..85f63c00bbdf74f8a896d4c75d736440cb4cd62f 100644 (file)
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -95,6 +95,11 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 #include <openssl/rand.h>
 #include <openssl/bn.h>
 
+#if defined(_MSC_VER) && defined(_MIPS_) && (_MSC_VER/100==12)
+/* suppress "too big too optimize" warning */
+#pragma warning(disable:4959)
+#endif
+
 #define ABORT do { \
        fflush(stdout); \
        fprintf(stderr, "%s:%d: ABORT\n", __FILE__, __LINE__); \
@@ -226,7 +231,7 @@ void prime_field_tests()
                EC_GROUP *tmp;
                tmp = EC_GROUP_new(EC_GROUP_method_of(group));
                if (!tmp) ABORT;
-               if (!EC_GROUP_copy(tmp, group));
+               if (!EC_GROUP_copy(tmp, group)) ABORT;
                EC_GROUP_free(group);
                group = tmp;
        }
@@ -672,7 +677,7 @@ void prime_field_tests()
 
                if (!BN_pseudo_rand(y, BN_num_bits(y), 0, 0)) ABORT;
                if (!BN_add(z, z, y)) ABORT;
-               BN_set_sign(z, 1);
+               BN_set_negative(z, 1);
                scalars[0] = y;
                scalars[1] = z; /* z = -(order + y) */
 
@@ -684,7 +689,7 @@ void prime_field_tests()
 
                if (!BN_pseudo_rand(x, BN_num_bits(y) - 1, 0, 0)) ABORT;
                if (!BN_add(z, x, y)) ABORT;
-               BN_set_sign(z, 1);
+               BN_set_negative(z, 1);
                scalars[0] = x;
                scalars[1] = y;
                scalars[2] = z; /* z = -(x+y) */
@@ -829,7 +834,7 @@ void char2_field_tests()
                EC_GROUP *tmp;
                tmp = EC_GROUP_new(EC_GROUP_method_of(group));
                if (!tmp) ABORT;
-               if (!EC_GROUP_copy(tmp, group));
+               if (!EC_GROUP_copy(tmp, group)) ABORT;
                EC_GROUP_free(group);
                group = tmp;
        }
@@ -1147,7 +1152,7 @@ void char2_field_tests()
 
                if (!BN_pseudo_rand(y, BN_num_bits(y), 0, 0)) ABORT;
                if (!BN_add(z, z, y)) ABORT;
-               BN_set_sign(z, 1);
+               BN_set_negative(z, 1);
                scalars[0] = y;
                scalars[1] = z; /* z = -(order + y) */
 
@@ -1159,7 +1164,7 @@ void char2_field_tests()
 
                if (!BN_pseudo_rand(x, BN_num_bits(y) - 1, 0, 0)) ABORT;
                if (!BN_add(z, x, y)) ABORT;
-               BN_set_sign(z, 1);
+               BN_set_negative(z, 1);
                scalars[0] = x;
                scalars[1] = y;
                scalars[2] = z; /* z = -(x+y) */
@@ -1252,10 +1257,10 @@ void internal_curve_test(void)
                {
                EC_GROUP *group = NULL;
                int nid = curves[n].nid;
-               if ((group = EC_GROUP_new_by_nid(nid)) == NULL)
+               if ((group = EC_GROUP_new_by_curve_name(nid)) == NULL)
                        {
                        ok = 0;
-                       fprintf(stdout, "\nEC_GROUP_new_by_nid() failed with"
+                       fprintf(stdout, "\nEC_GROUP_new_curve_name() failed with"
                                " curve %s\n", OBJ_nid2sn(nid));
                        /* try next curve */
                        continue;