This commit was generated by cvs2git to track changes on a CVS vendor

branch.

2 files changed, 8 insertions, 0 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);