aboutsummaryrefslogtreecommitdiffstats
path: root/apps/pkcs12.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2005-05-15 00:54:45 +0000
committerDr. Stephen Henson <steve@openssl.org>2005-05-15 00:54:45 +0000
commitb6995add5c91e9d62812883d884f0c558e6235d3 (patch)
treede05b05031f2ddd4848598a1e8e33e0aa3021c06 /apps/pkcs12.c
parent8ccd06c66c948916a5a3984087860e297f49051d (diff)
downloadopenssl-b6995add5c91e9d62812883d884f0c558e6235d3.tar.gz
Make -CSP option work again in pkcs12 utility by checking for
attribute in EVP_PKEY structure.
Diffstat (limited to 'apps/pkcs12.c')
-rw-r--r--apps/pkcs12.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 410781e784..d77358a239 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -538,6 +538,10 @@ int MAIN(int argc, char **argv)
catmp = (unsigned char *)sk_value(canames, i);
X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
}
+
+ if (csp_name && key)
+ EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
+ MBSTRING_ASC, (unsigned char *)csp_name, -1);
#ifdef CRYPTO_MDEBUG