make ciphers work again for FIPS builds

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 8835d9a6ede827c7cef891206742fcf3bbe22ba0..0c54f05e6ef511e3ae27ed0ec2b46c1ea26fa9f1 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -172,7 +172,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
 #ifdef OPENSSL_FIPS
                if (FIPS_mode())
                        return FIPS_cipherinit(ctx, cipher, key, iv, enc);
-#else
+#endif
                ctx->cipher=cipher;
                if (ctx->cipher->ctx_size)
                        {
@@ -197,7 +197,6 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
                                return 0;
                                }
                        }
-#endif
                }
        else if(!ctx->cipher)
                {
@@ -210,7 +209,7 @@ skip_to_init:
 #ifdef OPENSSL_FIPS
        if (FIPS_mode())
                return FIPS_cipherinit(ctx, cipher, key, iv, enc);
-#else
+#endif
        /* we assume block size is a power of 2 in *cryptUpdate */
        OPENSSL_assert(ctx->cipher->block_size == 1
            || ctx->cipher->block_size == 8
@@ -257,7 +256,6 @@ skip_to_init:
        ctx->final_used=0;
        ctx->block_mask=ctx->cipher->block_size-1;
        return 1;
-#endif
        }
 
 int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,