diff options
Diffstat (limited to 'openssl/crypto/pkcs12/p12_crt.c')
| -rw-r--r-- | openssl/crypto/pkcs12/p12_crt.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/openssl/crypto/pkcs12/p12_crt.c b/openssl/crypto/pkcs12/p12_crt.c index 9522342fa..96b131def 100644 --- a/openssl/crypto/pkcs12/p12_crt.c +++ b/openssl/crypto/pkcs12/p12_crt.c @@ -59,10 +59,6 @@ #include <stdio.h> #include "cryptlib.h" #include <openssl/pkcs12.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif - static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag); @@ -94,14 +90,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, /* Set defaults */ if (!nid_cert) - { -#ifdef OPENSSL_FIPS - if (FIPS_mode()) - nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; - else -#endif nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; - } if (!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; if (!iter) |