Prepare to provide EC_POINT_{g,s}et_affine_coordinates

Similar to part of OpenSSL commit 8e3cced75fb5fee5da59ebef9605d403a999391b

ok jsing

3 files changed, 10 insertions, 11 deletions

diff --git a/src/lib/libcrypto/gost/gostr341001.c b/src/lib/libcrypto/gost/gostr341001.c
index ba70d5f1fc..bfbd032161 100644
--- a/src/lib/libcrypto/gost/gostr341001.c
+++ b/src/lib/libcrypto/gost/gostr341001.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001.c,v 1.7 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: gostr341001.c,v 1.8 2021/04/20 17:16:38 tb Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -206,7 +206,7 @@ gost2001_do_sign(BIGNUM *md, GOST_KEY *eckey)
                                 GOSTerror(ERR_R_EC_LIB);
                                 goto err;
                         }
-                        if (EC_POINT_get_affine_coordinates_GFp(group, C, X,
+                        if (EC_POINT_get_affine_coordinates(group, C, X,
                             NULL, ctx) == 0) {
                                 GOSTerror(ERR_R_EC_LIB);
                                 goto err;
@@ -304,7 +304,7 @@ gost2001_do_verify(BIGNUM *md, ECDSA_SIG *sig, GOST_KEY *ec)
                 GOSTerror(ERR_R_EC_LIB);
                 goto err;
         }
-        if (EC_POINT_get_affine_coordinates_GFp(group, C, X, NULL, ctx) == 0) {
+        if (EC_POINT_get_affine_coordinates(group, C, X, NULL, ctx) == 0) {
                 GOSTerror(ERR_R_EC_LIB);
                 goto err;
         }
@@ -354,7 +354,7 @@ VKO_compute_key(BIGNUM *X, BIGNUM *Y, const GOST_KEY *pkey, GOST_KEY *priv_key,
                 goto err;
         if (EC_POINT_mul(group, pnt, NULL, pub_key, p, ctx) == 0)
                 goto err;
-        if (EC_POINT_get_affine_coordinates_GFp(group, pnt, X, Y, ctx) == 0)
+        if (EC_POINT_get_affine_coordinates(group, pnt, X, Y, ctx) == 0)
                 goto err;
         ok = 1;
 
diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c
index 27a95f2069..294b654d4f 100644
--- a/src/lib/libcrypto/gost/gostr341001_ameth.c
+++ b/src/lib/libcrypto/gost/gostr341001_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_ameth.c,v 1.16 2020/06/05 17:17:22 jsing Exp $ */
+/* $OpenBSD: gostr341001_ameth.c,v 1.17 2021/04/20 17:16:38 tb Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -290,7 +290,7 @@ pub_encode_gost01(X509_PUBKEY *pub, const EVP_PKEY *pk)
                 goto err;
         }
 
-        if (EC_POINT_get_affine_coordinates_GFp(GOST_KEY_get0_group(ec),
+        if (EC_POINT_get_affine_coordinates(GOST_KEY_get0_group(ec),
             pub_key, X, Y, NULL) == 0) {
                 GOSTerror(ERR_R_EC_LIB);
                 goto err;
@@ -352,8 +352,7 @@ pub_print_gost01(BIO *out, const EVP_PKEY *pkey, int indent, ASN1_PCTX *pctx)
                 goto err;
         pubkey = GOST_KEY_get0_public_key(pkey->pkey.gost);
         group = GOST_KEY_get0_group(pkey->pkey.gost);
-        if (EC_POINT_get_affine_coordinates_GFp(group, pubkey, X, Y,
-            ctx) == 0) {
+        if (EC_POINT_get_affine_coordinates(group, pubkey, X, Y, ctx) == 0) {
                 GOSTerror(ERR_R_EC_LIB);
                 goto err;
         }
diff --git a/src/lib/libcrypto/gost/gostr341001_key.c b/src/lib/libcrypto/gost/gostr341001_key.c
index 0af39f21bf..d5d885c257 100644
--- a/src/lib/libcrypto/gost/gostr341001_key.c
+++ b/src/lib/libcrypto/gost/gostr341001_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_key.c,v 1.8 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: gostr341001_key.c,v 1.9 2021/04/20 17:16:38 tb Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -201,10 +201,10 @@ GOST_KEY_set_public_key_affine_coordinates(GOST_KEY *key, BIGNUM *x, BIGNUM *y)
                 goto err;
         if ((ty = BN_CTX_get(ctx)) == NULL)
                 goto err;
-        if (EC_POINT_set_affine_coordinates_GFp(key->group, point, x, y,
+        if (EC_POINT_set_affine_coordinates(key->group, point, x, y,
             ctx) == 0)
                 goto err;
-        if (EC_POINT_get_affine_coordinates_GFp(key->group, point, tx, ty,
+        if (EC_POINT_get_affine_coordinates(key->group, point, tx, ty,
             ctx) == 0)
                 goto err;
         /*