From: Dr. Stephen Henson Date: Wed, 18 Sep 2013 13:45:59 +0000 (+0100) Subject: Fix warning. X-Git-Tag: OpenSSL_1_0_2-beta1~259 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7560f63909bdb1baa751eadc7538e44f27c3f731;p=oweals%2Fopenssl.git Fix warning. --- diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index 9d9a25d099..a34915d02d 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -90,12 +90,14 @@ 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)