From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 9 Dec 2014 10:40:12 +0000 (+0100)
Subject: pki: Reformat PKCS#12 output and add an index for each certificate/key
X-Git-Tag: 5.2.2rc1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c20f962732e62407c761ab40b4f4ab2eac57aad0;p=thirdparty%2Fstrongswan.git

pki: Reformat PKCS#12 output and add an index for each certificate/key
---

diff --git a/src/pki/commands/pkcs12.c b/src/pki/commands/pkcs12.c
index f871042b1d..a6b260caa4 100644
--- a/src/pki/commands/pkcs12.c
+++ b/src/pki/commands/pkcs12.c
@@ -28,9 +28,9 @@ static int show(pkcs12_t *pkcs12)
 	enumerator_t *enumerator;
 	certificate_t *cert;
 	private_key_t *key;
+	int index = 1;
 
-	printf("PKCS#12 contents:\n");
-
+	printf("Certificates:\n");
 	enumerator = pkcs12->create_cert_enumerator(pkcs12);
 	while (enumerator->enumerate(enumerator, &cert))
 	{
@@ -38,18 +38,21 @@ static int show(pkcs12_t *pkcs12)
 
 		if (x509->get_flags(x509) & X509_CA)
 		{
-			printf("  CA certificate \"%Y\"\n", cert->get_subject(cert));
+			printf("[%2d] \"%Y\" (CA)\n", index++, cert->get_subject(cert));
 		}
 		else
 		{
-			printf("  Certificate \"%Y\"\n", cert->get_subject(cert));
+			printf("[%2d] \"%Y\"\n", index++, cert->get_subject(cert));
 		}
 	}
 	enumerator->destroy(enumerator);
+
+	printf("Private keys:\n");
 	enumerator = pkcs12->create_key_enumerator(pkcs12);
 	while (enumerator->enumerate(enumerator, &key))
 	{
-		printf("  %N private key\n", key_type_names, key->get_type(key));
+		printf("[%2d] %N %d bits\n", index++, key_type_names,
+			   key->get_type(key), key->get_keysize(key));
 	}
 	enumerator->destroy(enumerator);
 	return 0;
@@ -65,7 +68,7 @@ static int pkcs12()
 	int res = 1;
 	enum {
 		OP_NONE,
-		OP_SHOW,
+		OP_LIST,
 	} op = OP_NONE;
 
 	while (TRUE)
@@ -77,12 +80,12 @@ static int pkcs12()
 			case 'i':
 				file = arg;
 				continue;
-			case 'p':
+			case 'l':
 				if (op != OP_NONE)
 				{
 					goto invalid;
 				}
-				op = OP_SHOW;
+				op = OP_LIST;
 				continue;
 			case EOF:
 				break;
@@ -93,7 +96,7 @@ static int pkcs12()
 		break;
 	}
 
-	if (op != OP_SHOW)
+	if (op != OP_LIST)
 	{
 		return command_usage(NULL);
 	}
@@ -140,11 +143,11 @@ static void __attribute__ ((constructor))reg()
 {
 	command_register((command_t) {
 		pkcs12, 'u', "pkcs12", "PKCS#12 functions",
-		{"--show [--in file]"},
+		{"--list [--in file]"},
 		{
 			{"help",	'h', 0, "show usage information"},
-			{"show",	'p', 0, "show info about PKCS#12, print certificates and keys"},
 			{"in",		'i', 1, "input file, default: stdin"},
+			{"list",	'l', 0, "list certificates and keys"},
 		}
 	});
 }
diff --git a/src/pki/man/pki---pkcs12.1.in b/src/pki/man/pki---pkcs12.1.in
index 2830d80e11..bb082a0318 100644
--- a/src/pki/man/pki---pkcs12.1.in
+++ b/src/pki/man/pki---pkcs12.1.in
@@ -7,7 +7,7 @@ pki \-\-pkcs12 \- Provides PKCS#12 functions
 .SH "SYNOPSIS"
 .
 .SY pki\ \-\-pkcs12
-.BR \-\-show
+.BR \-\-list
 .OP \-\-in file
 .OP \-\-debug level
 .YS
@@ -40,8 +40,8 @@ Set debug level, default: 1.
 .BI "\-+, \-\-options " file
 Read command line options from \fIfile\fR.
 .TP
-.BI "\-p, \-\-show"
-Show information about PKCS#12 container, list certificates and keys.
+.BI "\-l, \-\-list"
+List certificates and keys contained in a PKCS#12 container.
 .TP
 .BI "\-i, \-\-in " file
 PKCS#12 input file. If not given the input is read from \fISTDIN\fR.