summaryrefslogtreecommitdiff
path: root/demos/pkcs12
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-11-28 14:53:33 -0500
committerRich Salz <rsalz@openssl.org>2017-11-30 14:53:46 -0500
commita4cefc86c820d3894ca960857ba4e7cf8e2014b0 (patch)
treeb3eda7c0dfad2a9b70c0113cf2f0f31888f58982 /demos/pkcs12
parente670e90319b902de528db0d22d7197b5de1f4891 (diff)
downloadopenssl-new-a4cefc86c820d3894ca960857ba4e7cf8e2014b0.tar.gz
Add "friendly name" extractor
From a comment posted by GitHub user "geniuz" Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4812)
Diffstat (limited to 'demos/pkcs12')
-rw-r--r--demos/pkcs12/README3
-rw-r--r--demos/pkcs12/pkread.c35
2 files changed, 35 insertions, 3 deletions
diff --git a/demos/pkcs12/README b/demos/pkcs12/README
deleted file mode 100644
index c87434b04f..0000000000
--- a/demos/pkcs12/README
+++ /dev/null
@@ -1,3 +0,0 @@
-PKCS#12 demo applications
-
-Written by Steve Henson.
diff --git a/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c
index 3b87d7a4ae..3f7913b2ae 100644
--- a/demos/pkcs12/pkread.c
+++ b/demos/pkcs12/pkread.c
@@ -15,6 +15,36 @@
/* Simple PKCS#12 file reader */
+static char *find_friendly_name(PKCS12 *p12)
+{
+ STACK_OF(PKCS7) *safes = PKCS12_unpack_authsafes(p12);
+ int n, m;
+ char *name = NULL;
+ PKCS7 *safe;
+ STACK_OF(PKCS12_SAFEBAG) *bags;
+ PKCS12_SAFEBAG *bag;
+
+ if ((safes = PKCS12_unpack_authsafes(p12)) == NULL)
+ return NULL;
+
+ for (n = 0; n < sk_PKCS7_num(safes) && name == NULL; n++) {
+ safe = sk_PKCS7_value(safes, n);
+ if (OBJ_obj2nid(safe->type) != NID_pkcs7_data
+ || (bags = PKCS12_unpack_p7data(safe)) == NULL)
+ continue;
+
+ for (m = 0; m < sk_PKCS12_SAFEBAG_num(bags) && name == NULL; m++) {
+ bag = sk_PKCS12_SAFEBAG_value(bags, m);
+ name = PKCS12_get_friendlyname(bag);
+ }
+ sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
+ }
+
+ sk_PKCS7_pop_free(safes, PKCS7_free);
+
+ return name;
+}
+
int main(int argc, char **argv)
{
FILE *fp;
@@ -22,7 +52,9 @@ int main(int argc, char **argv)
X509 *cert;
STACK_OF(X509) *ca = NULL;
PKCS12 *p12;
+ const char *name;
int i;
+
if (argc != 4) {
fprintf(stderr, "Usage: pkread p12file password opfile\n");
exit(1);
@@ -45,11 +77,14 @@ int main(int argc, char **argv)
ERR_print_errors_fp(stderr);
exit(1);
}
+ name = find_friendly_name(p12);
PKCS12_free(p12);
if ((fp = fopen(argv[3], "w")) == NULL) {
fprintf(stderr, "Error opening file %s\n", argv[1]);
exit(1);
}
+ if (name)
+ fprintf(fp, "***Friendly Name***\n%s\n", name);
if (pkey) {
fprintf(fp, "***Private Key***\n");
PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL);