generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only call FIPS_cipherinit in FIPS mode

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-04-18 22:42:06 +00:00
parent cc8f2fb917
commit 068fc255ac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/evp/evp_enc.c
View File

@ -170,7 +170,8 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
#endif #endif
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
return FIPS_cipherinit(ctx, cipher, key, iv, enc); if (FIPS_mode())
return FIPS_cipherinit(ctx, cipher, key, iv, enc);
#else #else
ctx->cipher=cipher; ctx->cipher=cipher;
if (ctx->cipher->ctx_size) if (ctx->cipher->ctx_size)
@ -207,7 +208,8 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
skip_to_init: skip_to_init:
#endif #endif
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
return FIPS_cipherinit(ctx, cipher, key, iv, enc); if (FIPS_mode())
return FIPS_cipherinit(ctx, cipher, key, iv, enc);
#else #else
/* we assume block size is a power of 2 in *cryptUpdate */ /* we assume block size is a power of 2 in *cryptUpdate */
OPENSSL_assert(ctx->cipher->block_size == 1 OPENSSL_assert(ctx->cipher->block_size == 1