Adjust ecdhtest.c for affine_coordinates change

diff --git a/regress/lib/libcrypto/ecdh/Makefile b/regress/lib/libcrypto/ecdh/Makefile
index b645771..ae26412 100644 (file)
--- a/regress/lib/libcrypto/ecdh/Makefile
+++ b/regress/lib/libcrypto/ecdh/Makefile
@@ -1,7 +1,7 @@
-#      $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
+#      $OpenBSD: Makefile,v 1.4 2021/04/20 17:21:27 tb Exp $
 
 PROG=  ecdhtest
-LDADD= -lcrypto
+LDADD= ${CRYPTO_INT}
 DPADD= ${LIBCRYPTO}
 WARNINGS=      Yes
 CFLAGS+=       -DLIBRESSL_INTERNAL -Werror

diff --git a/regress/lib/libcrypto/ecdh/ecdhtest.c b/regress/lib/libcrypto/ecdh/ecdhtest.c
index faf519e..81ba5a4 100644 (file)
--- a/regress/lib/libcrypto/ecdh/ecdhtest.c
+++ b/regress/lib/libcrypto/ecdh/ecdhtest.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ecdhtest.c,v 1.10 2018/07/17 17:06:49 tb Exp $        */
+/*     $OpenBSD: ecdhtest.c,v 1.11 2021/04/20 17:21:27 tb Exp $        */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -132,12 +132,12 @@ test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
 
        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
            NID_X9_62_prime_field) {
-               if (!EC_POINT_get_affine_coordinates_GFp(group,
+               if (!EC_POINT_get_affine_coordinates(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,
+               if (!EC_POINT_get_affine_coordinates(group,
                    EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
        }
 #endif
@@ -149,12 +149,12 @@ test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
 
        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
            NID_X9_62_prime_field) {
-               if (!EC_POINT_get_affine_coordinates_GFp(group,
+               if (!EC_POINT_get_affine_coordinates(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,
+               if (!EC_POINT_get_affine_coordinates(group,
                    EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
        }
 #endif