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

make ciphers work again for FIPS builds

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-04-20 00:07:48 +00:00
parent 7fc6d35be0
commit ecf963b80d
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 #ifdef OPENSSL_FIPS
if (FIPS_mode()) if (FIPS_mode())
return FIPS_cipherinit(ctx, cipher, key, iv, enc); return FIPS_cipherinit(ctx, cipher, key, iv, enc);
#else #endif
ctx->cipher=cipher; ctx->cipher=cipher;
if (ctx->cipher->ctx_size) 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; return 0;
} }
} }
#endif
} }
else if(!ctx->cipher) else if(!ctx->cipher)
{ {
@ -210,7 +209,7 @@ skip_to_init:
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
if (FIPS_mode()) if (FIPS_mode())
return FIPS_cipherinit(ctx, cipher, key, iv, enc); return FIPS_cipherinit(ctx, cipher, key, iv, enc);
#else #endif
/* 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
|| ctx->cipher->block_size == 8 || ctx->cipher->block_size == 8
@ -257,7 +256,6 @@ skip_to_init:
ctx->final_used=0; ctx->final_used=0;
ctx->block_mask=ctx->cipher->block_size-1; ctx->block_mask=ctx->cipher->block_size-1;
return 1; return 1;
#endif
} }
int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,