diff options
Diffstat (limited to 'src/lib/libssl/src/crypto/pkcs12/p12_crt.c')
| -rw-r--r-- | src/lib/libssl/src/crypto/pkcs12/p12_crt.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c index 9522342fa5..96b131defa 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c | |||
| @@ -59,10 +59,6 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
| 61 | #include <openssl/pkcs12.h> | 61 | #include <openssl/pkcs12.h> |
| 62 | #ifdef OPENSSL_FIPS | ||
| 63 | #include <openssl/fips.h> | ||
| 64 | #endif | ||
| 65 | |||
| 66 | 62 | ||
| 67 | 63 | ||
| 68 | static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag); | 64 | 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, | |||
| 94 | 90 | ||
| 95 | /* Set defaults */ | 91 | /* Set defaults */ |
| 96 | if (!nid_cert) | 92 | if (!nid_cert) |
| 97 | { | ||
| 98 | #ifdef OPENSSL_FIPS | ||
| 99 | if (FIPS_mode()) | ||
| 100 | nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | ||
| 101 | else | ||
| 102 | #endif | ||
| 103 | nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; | 93 | nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; |
| 104 | } | ||
| 105 | if (!nid_key) | 94 | if (!nid_key) |
| 106 | nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | 95 | nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; |
| 107 | if (!iter) | 96 | if (!iter) |
