diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-05-30 21:39:50 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-06-05 15:06:02 +0100 |
| commit | af908bc48b64ef80dec48263f791d6a4e2874232 (patch) | |
| tree | 46b5183c1ebf5c5122d44acfca2c4d3a49c09d00 /apps | |
| parent | 233ebcb543b25135643c2954e469248d7adc1d21 (diff) | |
Don't use RC2 with PKCS#12 files in FIPS mode.
(cherry picked from commit cdb6c48445ded3daafab32e5f266943d07bb512b)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index b54c6f84a4..4d62a7b8ca 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -112,7 +112,7 @@ int MAIN(int argc, char **argv) int maciter = PKCS12_DEFAULT_ITER; int twopass = 0; int keytype = 0; - int cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; + int cert_pbe; int key_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; int ret = 1; int macver = 1; @@ -130,6 +130,13 @@ int MAIN(int argc, char **argv) apps_startup(); +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; + else +#endif + cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; + enc = EVP_des_ede3_cbc(); if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE); |