Commit 00bb8752 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make ciphers work again for FIPS builds

parent c3cb563d

crypto/evp/evp_enc.c

+2 −4
Original line number Diff line number Diff line
@@ -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,