From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 21 Jan 2021 11:37:21 +0000 (+0100)
Subject: ssl_old_test.c: Replace use of deprecated EC functions
X-Git-Tag: openssl-3.0.0-alpha11~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59b64259b8392fea1c88dc992eaed9ba8b29fa80;p=thirdparty%2Fopenssl.git

ssl_old_test.c: Replace use of deprecated EC functions

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13139)
---

diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c
index f63ec678548..69b01b7e0a6 100644
--- a/test/ssl_old_test.c
+++ b/test/ssl_old_test.c
@@ -718,20 +718,16 @@ static void sv_usage(void)
 static void print_key_details(BIO *out, EVP_PKEY *key)
 {
     int keyid = EVP_PKEY_id(key);
-#if 0
+
 #ifndef OPENSSL_NO_EC
     if (keyid == EVP_PKEY_EC) {
-        EC_KEY *ec = EVP_PKEY_get1_EC_KEY(key);
-        int nid;
-        const char *cname;
-        nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
-        EC_KEY_free(ec);
-        cname = EC_curve_nid2nist(nid);
-        if (!cname)
-            cname = OBJ_nid2sn(nid);
-        BIO_printf(out, "%d bits EC (%s)", EVP_PKEY_bits(key), cname);
+        char group[80];
+        size_t size;
+
+        if (!EVP_PKEY_get_group_name(key, group, sizeof(group), &size))
+            strcpy(group, "unknown group");
+        BIO_printf(out, "%d bits EC (%s)", EVP_PKEY_bits(key), group);
     } else
-#endif
 #endif
     {
         const char *algname;