import OpenSSL-1.0.1c

3 files changed, 16 insertions, 6 deletions

diff --git a/src/lib/libcrypto/ecdh/ecdhtest.c b/src/lib/libcrypto/ecdh/ecdhtest.c
index 212a87efa4..823d7baa65 100644
--- a/src/lib/libcrypto/ecdh/ecdhtest.c
+++ b/src/lib/libcrypto/ecdh/ecdhtest.c
@@ -158,11 +158,13 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
                 if (!EC_POINT_get_affine_coordinates_GFp(group,
                         EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
                 }
+#ifndef OPENSSL_NO_EC2M
         else
                 {
                 if (!EC_POINT_get_affine_coordinates_GF2m(group,
                         EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
                 }
+#endif
 #ifdef NOISY
         BIO_puts(out,"  pri 1=");
         BN_print(out,a->priv_key);
@@ -183,11 +185,13 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
                 if (!EC_POINT_get_affine_coordinates_GFp(group, 
                         EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
                 }
+#ifndef OPENSSL_NO_EC2M
         else
                 {
                 if (!EC_POINT_get_affine_coordinates_GF2m(group, 
                         EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
                 }
+#endif
 
 #ifdef NOISY
         BIO_puts(out,"  pri 2=");
@@ -324,6 +328,7 @@ int main(int argc, char *argv[])
         if (!test_ecdh_curve(NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out)) goto err;
         if (!test_ecdh_curve(NID_secp384r1, "NIST Prime-Curve P-384", ctx, out)) goto err;
         if (!test_ecdh_curve(NID_secp521r1, "NIST Prime-Curve P-521", ctx, out)) goto err;
+#ifndef OPENSSL_NO_EC2M
         /* NIST BINARY CURVES TESTS */
         if (!test_ecdh_curve(NID_sect163k1, "NIST Binary-Curve K-163", ctx, out)) goto err;
         if (!test_ecdh_curve(NID_sect163r2, "NIST Binary-Curve B-163", ctx, out)) goto err;
@@ -335,6 +340,7 @@ int main(int argc, char *argv[])
         if (!test_ecdh_curve(NID_sect409r1, "NIST Binary-Curve B-409", ctx, out)) goto err;
         if (!test_ecdh_curve(NID_sect571k1, "NIST Binary-Curve K-571", ctx, out)) goto err;
         if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out)) goto err;
+#endif
 
         ret = 0;
 
diff --git a/src/lib/libcrypto/ecdh/ech_ossl.c b/src/lib/libcrypto/ecdh/ech_ossl.c
index 2a40ff12df..4a30628fbc 100644
--- a/src/lib/libcrypto/ecdh/ech_ossl.c
+++ b/src/lib/libcrypto/ecdh/ech_ossl.c
@@ -157,6 +157,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
                         goto err;
                         }
                 }
+#ifndef OPENSSL_NO_EC2M
         else
                 {
                 if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) 
@@ -165,6 +166,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
                         goto err;
                         }
                 }
+#endif
 
         buflen = (EC_GROUP_get_degree(group) + 7)/8;
         len = BN_num_bytes(x);
diff --git a/src/lib/libcrypto/ecdsa/ecdsatest.c b/src/lib/libcrypto/ecdsa/ecdsatest.c
index 54cfb8c753..537bb30362 100644
--- a/src/lib/libcrypto/ecdsa/ecdsatest.c
+++ b/src/lib/libcrypto/ecdsa/ecdsatest.c
@@ -262,6 +262,7 @@ int x9_62_tests(BIO *out)
                 "3238135532097973577080787768312505059318910517550078427819"
                 "78505179448783"))
                 goto x962_err;
+#ifndef OPENSSL_NO_EC2M
         if (!x9_62_test_internal(out, NID_X9_62_c2tnb191v1,
                 "87194383164871543355722284926904419997237591535066528048",
                 "308992691965804947361541664549085895292153777025772063598"))
@@ -272,7 +273,7 @@ int x9_62_tests(BIO *out)
                 "1970303740007316867383349976549972270528498040721988191026"
                 "49413465737174"))
                 goto x962_err;
-
+#endif
         ret = 1;
 x962_err:
         if (!restore_rand())
@@ -289,7 +290,8 @@ int test_builtin(BIO *out)
         ECDSA_SIG       *ecdsa_sig = NULL;
         unsigned char   digest[20], wrong_digest[20];
         unsigned char   *signature = NULL;
-        unsigned char   *sig_ptr;
+        const unsigned char     *sig_ptr;
+        unsigned char   *sig_ptr2;
         unsigned char   *raw_buf = NULL;
         unsigned int    sig_len, degree, r_len, s_len, bn_len, buf_len;
         int             nid, ret =  0;
@@ -464,8 +466,8 @@ int test_builtin(BIO *out)
                         (BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL))
                         goto builtin_err;
 
-                sig_ptr = signature;
-                sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr);
+                sig_ptr2 = signature;
+                sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2);
                 if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) == 1)
                         {
                         BIO_printf(out, " failed\n");
@@ -477,8 +479,8 @@ int test_builtin(BIO *out)
                         (BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL))
                         goto builtin_err;
 
-                sig_ptr = signature;
-                sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr);
+                sig_ptr2 = signature;
+                sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2);
                 if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1)
                         {
                         BIO_printf(out, " failed\n");