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, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index be57d875e3..b17908d7fa 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eck_prn.c,v 1.15 2018/07/15 16:27:39 tb Exp $ */
+/* $OpenBSD: eck_prn.c,v 1.16 2021/04/20 17:04:13 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -216,14 +216,14 @@ ECPKParameters_print(BIO * bp, const EC_GROUP * x, int off)
                 }
 #ifndef OPENSSL_NO_EC2M
                 if (is_char_two) {
-                        if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx)) {
+                        if (!EC_GROUP_get_curve(x, p, a, b, ctx)) {
                                 reason = ERR_R_EC_LIB;
                                 goto err;
                         }
                 } else          /* prime field */
 #endif
                 {
-                        if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx)) {
+                        if (!EC_GROUP_get_curve(x, p, a, b, ctx)) {
                                 reason = ERR_R_EC_LIB;
                                 goto err;
                         }