Commit 66d3fb6a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix for PKCS12_create if no-rc2 specified. 

Use triple DES for certificate encryption if no-rc2 is
specified.

PR#3357
(cherry picked from commit 2e2a6d0ecd8f6984c692078ec2e2683690e0bc59)
parent 92e2dc11

crypto/pkcs12/p12_crt.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -90,7 +90,11 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, 




	/* Set defaults */

	/* Set defaults */

	if (!nid_cert)

	if (!nid_cert)

#ifdef OPENSSL_NO_RC2

		nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;

#else

		nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;

		nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;

#endif

	if (!nid_key)

	if (!nid_key)

		nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;

		nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;

	if (!iter)

	if (!iter)
@@ -279,7 +283,11 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, 
		free_safes = 0;

		free_safes = 0;





	if (nid_safe == 0)

	if (nid_safe == 0)

#ifdef OPENSSL_NO_RC2

		nid_safe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;

#else

		nid_safe = NID_pbe_WithSHA1And40BitRC2_CBC;

		nid_safe = NID_pbe_WithSHA1And40BitRC2_CBC;

#endif





	if (nid_safe == -1)

	if (nid_safe == -1)

		p7 = PKCS12_pack_p7data(bags);

		p7 = PKCS12_pack_p7data(bags);