summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2021-04-20 17:21:27 +0000
committertb <>2021-04-20 17:21:27 +0000
commit0b9d2ddee375142a5100f30f23c6869070bcaedd (patch)
tree10929dc05f1270d009a7929256d3080f409299b0
parent1ae5a3df0d96377d2197509d5ae7a9671ed4fc3c (diff)
downloadopenbsd-0b9d2ddee375142a5100f30f23c6869070bcaedd.tar.gz
openbsd-0b9d2ddee375142a5100f30f23c6869070bcaedd.tar.bz2
openbsd-0b9d2ddee375142a5100f30f23c6869070bcaedd.zip
Adjust ecdhtest.c for affine_coordinates change
-rw-r--r--src/regress/lib/libcrypto/ecdh/Makefile4
-rw-r--r--src/regress/lib/libcrypto/ecdh/ecdhtest.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/regress/lib/libcrypto/ecdh/Makefile b/src/regress/lib/libcrypto/ecdh/Makefile
index b645771f7b..ae2641285a 100644
--- a/src/regress/lib/libcrypto/ecdh/Makefile
+++ b/src/regress/lib/libcrypto/ecdh/Makefile
@@ -1,7 +1,7 @@
1# $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $ 1# $OpenBSD: Makefile,v 1.4 2021/04/20 17:21:27 tb Exp $
2 2
3PROG= ecdhtest 3PROG= ecdhtest
4LDADD= -lcrypto 4LDADD= ${CRYPTO_INT}
5DPADD= ${LIBCRYPTO} 5DPADD= ${LIBCRYPTO}
6WARNINGS= Yes 6WARNINGS= Yes
7CFLAGS+= -DLIBRESSL_INTERNAL -Werror 7CFLAGS+= -DLIBRESSL_INTERNAL -Werror
diff --git a/src/regress/lib/libcrypto/ecdh/ecdhtest.c b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
index faf519e07a..81ba5a4710 100644
--- a/src/regress/lib/libcrypto/ecdh/ecdhtest.c
+++ b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecdhtest.c,v 1.10 2018/07/17 17:06:49 tb Exp $ */ 1/* $OpenBSD: ecdhtest.c,v 1.11 2021/04/20 17:21:27 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -132,12 +132,12 @@ test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
132 132
133 if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == 133 if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
134 NID_X9_62_prime_field) { 134 NID_X9_62_prime_field) {
135 if (!EC_POINT_get_affine_coordinates_GFp(group, 135 if (!EC_POINT_get_affine_coordinates(group,
136 EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err; 136 EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
137 } 137 }
138#ifndef OPENSSL_NO_EC2M 138#ifndef OPENSSL_NO_EC2M
139 else { 139 else {
140 if (!EC_POINT_get_affine_coordinates_GF2m(group, 140 if (!EC_POINT_get_affine_coordinates(group,
141 EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err; 141 EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
142 } 142 }
143#endif 143#endif
@@ -149,12 +149,12 @@ test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
149 149
150 if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == 150 if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
151 NID_X9_62_prime_field) { 151 NID_X9_62_prime_field) {
152 if (!EC_POINT_get_affine_coordinates_GFp(group, 152 if (!EC_POINT_get_affine_coordinates(group,
153 EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err; 153 EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
154 } 154 }
155#ifndef OPENSSL_NO_EC2M 155#ifndef OPENSSL_NO_EC2M
156 else { 156 else {
157 if (!EC_POINT_get_affine_coordinates_GF2m(group, 157 if (!EC_POINT_get_affine_coordinates(group,
158 EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err; 158 EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
159 } 159 }
160#endif 160#endif