Fix modes.h so that indent doesn't complain

[openssl.git] / crypto / pkcs12 / p12_crt.c

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index 9d9a25d0990c7f1c4b977476758cc86ecd73a79f..35e8a4a8d4ba226d705a006c2c226984e005ef45 100644 (file)
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -90,12 +90,18 @@ 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
+#ifdef OPENSSL_NO_RC2
+               nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+#else
                nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
+#endif
+               }
        if (!nid_key)
                nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
        if (!iter)
@@ -284,7 +290,11 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
                free_safes = 0;
 
        if (nid_safe == 0)
+#ifdef OPENSSL_NO_RC2
+               nid_safe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+#else
                nid_safe = NID_pbe_WithSHA1And40BitRC2_CBC;
+#endif
 
        if (nid_safe == -1)
                p7 = PKCS12_pack_p7data(bags);