X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fec%2Feck_prn.c;h=39ce97862dbd44dfa93db5a687d7731ffe33b1fd;hb=701d593f7095db84459c76265349a83d30a4cae5;hp=3a523c0451f28a69988cadf848a285638ac927b7;hpb=a4e75b3dfd01601b400f1eb46c6bf06c5d3127e5;p=oweals%2Fopenssl.git

diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c
index 3a523c0451..39ce97862d 100644
--- a/crypto/ec/eck_prn.c
+++ b/crypto/ec/eck_prn.c
@@ -65,6 +65,7 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/ec.h>
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_FP_API
 int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
@@ -176,6 +177,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 		{
 		/* the curve parameter are given by an asn1 OID */
 		int nid;
+		const char *nname;
 
 		if (!BIO_indent(bp, off, 128))
 			goto err;
@@ -183,11 +185,18 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 		nid = EC_GROUP_get_curve_name(x);
 		if (nid == 0)
 			goto err;
-
 		if (BIO_printf(bp, "ASN1 OID: %s", OBJ_nid2sn(nid)) <= 0)
 			goto err;
 		if (BIO_printf(bp, "\n") <= 0)
 			goto err;
+		nname = EC_curve_nid2nist(nid);
+		if (nname)
+			{
+			if (!BIO_indent(bp, off, 128))
+				goto err;
+			if (BIO_printf(bp, "NIST CURVE: %s\n", nname) <= 0)
+				goto err;
+			}
 		}
 	else
 		{
@@ -206,7 +215,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 			reason = ERR_R_MALLOC_FAILURE;
 			goto err;
 			}
-
+#ifndef OPENSSL_NO_EC2M
 		if (is_char_two)
 			{
 			if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx))
@@ -216,6 +225,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 				}
 			}
 		else /* prime field */
+#endif
 			{
 			if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
 				{