Make -CSP option work again in pkcs12 utility by checking for
attribute in EVP_PKEY structure.

crypto/evp/p_lib.c

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 934f8ff..85caa47 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -451,6 +451,8 @@
 		}
 #endif
 	EVP_PKEY_free_it(x);
+	if (x->attributes)
+		sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);
 	OPENSSL_free(x);
 	}