diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_crt.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crt.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index a34915d02d..96b131defa 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c | |||
| @@ -90,14 +90,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
| 90 | 90 | ||
| 91 | /* Set defaults */ | 91 | /* Set defaults */ |
| 92 | if (!nid_cert) | 92 | if (!nid_cert) |
| 93 | { | ||
| 94 | #ifdef OPENSSL_FIPS | ||
| 95 | if (FIPS_mode()) | ||
| 96 | nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | ||
| 97 | else | ||
| 98 | #endif | ||
| 99 | nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; | 93 | nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; |
| 100 | } | ||
| 101 | if (!nid_key) | 94 | if (!nid_key) |
| 102 | nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | 95 | nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; |
| 103 | if (!iter) | 96 | if (!iter) |
