diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_crt.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crt.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index 40340a7bef..4c36c643ce 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c | |||
@@ -76,15 +76,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
76 | unsigned int keyidlen; | 76 | unsigned int keyidlen; |
77 | 77 | ||
78 | /* Set defaults */ | 78 | /* Set defaults */ |
79 | if(!nid_cert) | 79 | if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; |
80 | { | ||
81 | #ifdef OPENSSL_FIPS | ||
82 | if (FIPS_mode()) | ||
83 | nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | ||
84 | else | ||
85 | #endif | ||
86 | nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; | ||
87 | } | ||
88 | if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | 80 | if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; |
89 | if(!iter) iter = PKCS12_DEFAULT_ITER; | 81 | if(!iter) iter = PKCS12_DEFAULT_ITER; |
90 | if(!mac_iter) mac_iter = 1; | 82 | if(!mac_iter) mac_iter = 1; |