From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Tue, 29 Sep 2020 08:33:22 +0000 (+0200)
Subject: EC_GROUP_new_by_curve_name_with_libctx(): Add name of unknown group to error output
X-Git-Tag: openssl-3.0.0-alpha7~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a24d6050bee3cafd3e1eb42b800ece23bdba6b5;p=thirdparty%2Fopenssl.git

EC_GROUP_new_by_curve_name_with_libctx(): Add name of unknown group to error output

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13023)
---

diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index bf02c261f74..a63a8535c37 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -18,6 +18,7 @@
 #include "ec_local.h"
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
+#include <openssl/objects.h>
 #include <openssl/opensslconf.h>
 #include "internal/nelem.h"
 #include "e_os.h" /* strcasecmp required by windows */
@@ -3298,6 +3299,9 @@ EC_GROUP *EC_GROUP_new_by_curve_name_with_libctx(OPENSSL_CTX *libctx,
     if ((curve = ec_curve_nid2curve(nid)) == NULL
         || (ret = ec_group_new_from_data(libctx, propq, *curve)) == NULL) {
         ECerr(0, EC_R_UNKNOWN_GROUP);
+#ifndef FIPS_MODULE
+        ERR_add_error_data(2, "name=", OBJ_nid2sn(nid));
+#endif
         return NULL;
     }