aboutsummaryrefslogtreecommitdiffstats
path: root/apps/pkcs12.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2001-06-11 00:43:20 +0000
committerDr. Stephen Henson <steve@openssl.org>2001-06-11 00:43:20 +0000
commitf2a253e0ddd23c9a7601276f37b536fff53f3f8f (patch)
tree2ef7d83b758e7cee96384caa11cf6f10166fff86 /apps/pkcs12.c
parent0ad0eaf61cb4979ac5c7f95b10c8cfb1170ade68 (diff)
downloadopenssl-f2a253e0ddd23c9a7601276f37b536fff53f3f8f.tar.gz
Add support for MS CSP Name PKCS#12 attribute.
Diffstat (limited to 'apps/pkcs12.c')
-rw-r--r--apps/pkcs12.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 90abbb84d2..f277956cd9 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -99,6 +99,7 @@ int MAIN(int argc, char **argv)
BIO *in=NULL, *out = NULL, *inkey = NULL, *certsin = NULL;
char **args;
char *name = NULL;
+ char *csp_name = NULL;
PKCS12 *p12 = NULL;
char pass[50], macpass[50];
int export_cert = 0;
@@ -197,6 +198,11 @@ int MAIN(int argc, char **argv)
args++;
name = *args;
} else badarg = 1;
+ } else if (!strcmp (*args, "-CSP")) {
+ if (args[1]) {
+ args++;
+ csp_name = *args;
+ } else badarg = 1;
} else if (!strcmp (*args, "-caname")) {
if (args[1]) {
args++;
@@ -572,6 +578,7 @@ int MAIN(int argc, char **argv)
PKCS8_PRIV_KEY_INFO_free(p8);
p8 = NULL;
if (name) PKCS12_add_friendlyname (bag, name, -1);
+ if(csp_name) PKCS12_add_CSPName_asc(bag, csp_name, -1);
PKCS12_add_localkeyid (bag, keyid, keyidlen);
bags = sk_PKCS12_SAFEBAG_new_null();
sk_PKCS12_SAFEBAG_push (bags, bag);