generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warning.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2013-09-16 06:12:00 +01:00
parent 13bca90ac5
commit 39aabe59c8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/pkcs12/p12_crt.c
View File

@ -90,12 +90,14 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
/* Set defaults */ /* Set defaults */
if (!nid_cert) if (!nid_cert)
{
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
if (FIPS_mode()) if (FIPS_mode())
nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
else else
#endif #endif
nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
}
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)