Prepare to provide EC_GROUP_{get,set}_curve(3)

There are numerous functions in ec/ that exist with _GF2m and _GFp
variants for no good reason.  The code of both variants is the same.
The EC_METHODs contain a pointer to the appropriate version.  This
commit hides the _GF2m and _GFp variants from internal use and
provides versions that work for both curve types. These will be made
public in an upcoming library bump.

Similar to part of OpenSSL commit 8e3cced75fb5fee5da59ebef9605d403a999391b

ok jsing

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/ec/ec_cvt.c b/src/lib/libcrypto/ec/ec_cvt.c
index a0982064b8..05c7dd1bf1 100644
--- a/src/lib/libcrypto/ec/ec_cvt.c
+++ b/src/lib/libcrypto/ec/ec_cvt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_cvt.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: ec_cvt.c,v 1.7 2021/04/20 17:04:13 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -112,7 +112,7 @@ EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b,
         if (ret == NULL)
                 return NULL;
 
-        if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx)) {
+        if (!EC_GROUP_set_curve(ret, p, a, b, ctx)) {
                 unsigned long err;
 
                 err = ERR_peek_last_error();
@@ -136,7 +136,7 @@ EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b,
                 if (ret == NULL)
                         return NULL;
 
-                if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx)) {
+                if (!EC_GROUP_set_curve(ret, p, a, b, ctx)) {
                         EC_GROUP_clear_free(ret);
                         return NULL;
                 }
@@ -158,7 +158,7 @@ EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b,
         if (ret == NULL)
                 return NULL;
 
-        if (!EC_GROUP_set_curve_GF2m(ret, p, a, b, ctx)) {
+        if (!EC_GROUP_set_curve(ret, p, a, b, ctx)) {
                 EC_GROUP_clear_free(ret);
                 return NULL;
         }