wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make ciphers work again for FIPS builds

Browse source
This commit is contained in:
Dr. Stephen Henson 2012-04-20 00:08:32 +00:00
parent c3cb563d87
commit 00bb875240
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/evp/evp_enc.c
View file

@ -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,