diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-12 00:44:07 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-09-12 01:02:23 +0100 |
| commit | 2aa5a2c76656f3873fecd0f0bcc628c1861c27a9 (patch) | |
| tree | afb68a002a82e87ce20dc60f1b2f265e97fa1fe1 /apps/pkcs12.c | |
| parent | eac2b837d63fbac8acb3a9d1f65a2d8379edfc93 (diff) | |
Check for FIPS mode after loading config.
PR#3958
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 4ff64495a9..e41b445a50 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -134,13 +134,6 @@ 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); @@ -148,6 +141,13 @@ int MAIN(int argc, char **argv) if (!load_config(bio_err, NULL)) goto end; +# ifdef OPENSSL_FIPS + if (FIPS_mode()) + cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; + else +# endif + cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; + args = argv + 1; while (*args) { |