X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fpkcs12.c;h=c22c00fce156147fe9e0b121f4cecdd0c93079ba;hb=54f51116b2fb12410fb17a1bfe6a400399e6456b;hp=410781e7846a5d2e411179bce698ee8e9978f92a;hpb=7d727231b735750c0876089204fe46c058e3f675;p=oweals%2Fopenssl.git

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 410781e784..c22c00fce1 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -1,6 +1,4 @@
 /* pkcs12.c */
-#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
-
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
  * project.
  */
@@ -58,6 +56,9 @@
  *
  */
 
+#include <openssl/opensslconf.h>
+#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -538,6 +539,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