Prepare to provide EC_POINT_{g,s}et_affine_coordinates

Similar to part of OpenSSL commit 8e3cced75fb5fee5da59ebef9605d403a999391b

ok jsing

1 files changed, 3 insertions, 5 deletions

diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c
index 378912cacb..c82002ea46 100644
--- a/src/lib/libcrypto/ecdh/ech_key.c
+++ b/src/lib/libcrypto/ecdh/ech_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_key.c,v 1.9 2019/01/19 01:12:48 tb Exp $ */
+/* $OpenBSD: ech_key.c,v 1.10 2021/04/20 17:16:38 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -142,16 +142,14 @@ ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
 
         if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
             NID_X9_62_prime_field) {
-                if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y,
-                    ctx)) {
+                if (!EC_POINT_get_affine_coordinates(group, tmp, x, y, ctx)) {
                         ECDHerror(ECDH_R_POINT_ARITHMETIC_FAILURE);
                         goto err;
                 }
         }
 #ifndef OPENSSL_NO_EC2M
         else {
-                if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y,
-                    ctx)) {
+                if (!EC_POINT_get_affine_coordinates(group, tmp, x, y, ctx)) {
                         ECDHerror(ECDH_R_POINT_ARITHMETIC_FAILURE);
                         goto err;
                 }