add field type to text output

don't print seed value as a number (leading zeros must not be removed)

Submitted by: Nils Larsch

1 files changed, 74 insertions, 25 deletions

diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index 873b5d793c..964fd914f7 100644
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -81,6 +81,8 @@
 
 static int print(BIO *fp,const char *str,BIGNUM *num,
 		unsigned char *buf,int off);
+static int print_bin(BIO *fp, const char *str, const unsigned char *num,
+		size_t len, int off);
 #ifndef OPENSSL_NO_RSA
 #ifndef OPENSSL_NO_FP_API
 int RSA_print_fp(FILE *fp, const RSA *x, int off)
@@ -289,7 +291,9 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 	BN_CTX  *ctx=NULL;
 	EC_POINT *point=NULL;
 	BIGNUM	*p=NULL, *a=NULL, *b=NULL, *gen=NULL,
-		*order=NULL, *cofactor=NULL, *seed=NULL;
+		*order=NULL, *cofactor=NULL;
+	const unsigned char *seed;
+	size_t	seed_len=0;
 	
 	static const char *gen_compressed = "Generator (compressed):";
 	static const char *gen_uncompressed = "Generator (uncompressed):";
@@ -327,8 +331,12 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 	else
 		{
 		/* explicit parameters */
-		/* TODO */
+		int is_char_two = 0;
 		point_conversion_form_t form;
+		int tmp_nid = EC_METHOD_get_field_type(EC_GROUP_method_of(x));
+
+		if (tmp_nid == NID_X9_62_characteristic_two_field)
+			is_char_two = 1;
 
 		if ((p = BN_new()) == NULL || (a = BN_new()) == NULL ||
 			(b = BN_new()) == NULL || (order = BN_new()) == NULL ||
@@ -338,17 +346,17 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 			goto err;
 			}
 
-		if (EC_METHOD_get_field_type(EC_GROUP_method_of(x)) == NID_X9_62_prime_field) 
+		if (is_char_two)
 			{
-			if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
+			if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx))
 				{
 				reason = ERR_R_EC_LIB;
 				goto err;
 				}
 			}
-		else
+		else /* prime field */
 			{
-			if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx))
+			if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
 				{
 				reason = ERR_R_EC_LIB;
 				goto err;
@@ -388,18 +396,8 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 		if (buf_len < (i = (size_t)BN_num_bytes(cofactor))) 
 			buf_len = i;
 
-		if (EC_GROUP_get0_seed(x))
-			{
-			seed = BN_bin2bn(EC_GROUP_get0_seed(x),
-				EC_GROUP_get_seed_len(x), NULL);
-			if (seed == NULL)
-				{
-				reason = ERR_R_BN_LIB;
-				goto err;
-				}
-			if (buf_len < (i = (size_t)BN_num_bytes(seed))) 
-				buf_len = i;
-			}
+		if ((seed = EC_GROUP_get0_seed(x)) != NULL)
+			seed_len = EC_GROUP_get_seed_len(x);
 
 		buf_len += 10;
 		if ((buffer = OPENSSL_malloc(buf_len)) == NULL)
@@ -411,10 +409,25 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 			{
 			if (off > 128) off=128;
 			memset(str,' ',off);
+			if (BIO_write(bp, str, off) <= 0)
+				goto err;
+			}
+
+		if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid))
+			<= 0)
+			goto err;  
+
+		if (is_char_two)
+			{
+			if ((p != NULL) && !print(bp, "Polynomial:", p, buffer,
+				off))
+				goto err;
+			}
+		else
+			{
+			if ((p != NULL) && !print(bp, "Prime:", p, buffer,off))
+				goto err;
 			}
-  
-		if ((p != NULL) && !print(bp, "P:   ", p, buffer, off)) 
-			goto err;
 		if ((a != NULL) && !print(bp, "A:   ", a, buffer, off)) 
 			goto err;
 		if ((b != NULL) && !print(bp, "B:   ", b, buffer, off))
@@ -441,8 +454,8 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 			buffer, off)) goto err;
 		if ((cofactor != NULL) && !print(bp, "Cofactor: ", cofactor, 
 			buffer, off)) goto err;
-		if ((seed != NULL) && !print(bp, "Seed:", seed, 
-			buffer, off)) goto err;
+		if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
+			goto err;
 		}
 	ret=1;
 err:
@@ -460,8 +473,6 @@ err:
 		BN_free(order);
 	if (cofactor)
 		BN_free(cofactor);
-	if (seed) 
-		BN_free(seed);
 	if (ctx)
 		BN_CTX_free(ctx);
 	if (buffer != NULL) 
@@ -588,6 +599,44 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
 	return(1);
 	}
 
+static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
+		size_t len, int off)
+	{
+	int i;
+	char str[128];
+
+	if (buf == NULL)
+		return 1;
+	if (off)
+		{
+		if (off > 128)
+			off=128;
+		memset(str,' ',off);
+		if (BIO_write(fp, str, off) <= 0)
+			return 0;
+		}
+
+	if (BIO_printf(fp,"%s", name) <= 0)
+		return 0;
+
+	for (i=0; i<len; i++)
+		{
+		if ((i%15) == 0)
+			{
+			str[0]='\n';
+			memset(&(str[1]),' ',off+4);
+			if (BIO_write(fp, str, off+1+4) <= 0)
+				return 0;
+			}
+		if (BIO_printf(fp,"%02x%s",buf[i],((i+1) == len)?"":":") <= 0)
+			return 0;
+		}
+	if (BIO_write(fp,"\n",1) <= 0)
+		return 0;
+
+	return 1;
+	}
+
 #ifndef OPENSSL_NO_DH
 #ifndef OPENSSL_NO_FP_API
 int DHparams_print_fp(FILE *fp, const DH *x)