diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-04-20 00:07:48 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-04-20 00:07:48 +0000 |
| commit | ecf963b80d670971581eee7b8e14e9c5f20e3aa0 (patch) | |
| tree | 07d5f3ec653ff2874b7fc1f8fe2544aed4252433 /crypto/evp | |
| parent | 7fc6d35be0b668269c7d36fbf472dbf2e0e2beeb (diff) | |
make ciphers work again for FIPS builds
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp_enc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 8835d9a6ed..0c54f05e6e 100644 --- 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, |