Commit 5792219d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Redirect cipher operations to FIPS module for FIPS builds.

parent 293c58c1

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 1.0.0d and 1.0.1  [xx XXX xxxx]



  *) Redirect cipher operations to FIPS module for FIPS builds. 

     [Steve Henson]



  *) Redirect digest operations to FIPS module for FIPS builds. 

     [Steve Henson]

crypto/evp/evp_enc.c

+60 −5
Original line number Diff line number Diff line
@@ -69,6 +69,13 @@ 
#endif

#include "evp_locl.h"



#ifdef OPENSSL_FIPS

#define M_do_cipher(ctx, out, in, inl) FIPS_cipher(ctx, out, in, inl)

#else

#define M_do_cipher(ctx, out, in, inl) ctx->cipher->do_cipher(ctx, out, in, inl)

#endif





const char EVP_version[]="EVP" OPENSSL_VERSION_PTEXT;



void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
@@ -297,6 +304,16 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 
	{

	int i,j,bl;



	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

		{

		i = M_do_cipher(ctx, out, in, inl);

		if (i < 0)

			return 0;

		else

			*outl = i;

		return 1;

		}



	if (inl <= 0)

		{

		*outl = 0;
@@ -305,7 +322,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 


	if(ctx->buf_len == 0 && (inl&(ctx->block_mask)) == 0)

		{

		if(ctx->cipher->do_cipher(ctx,out,in,inl))

		if(M_do_cipher(ctx,out,in,inl))

			{

			*outl=inl;

			return 1;
@@ -332,7 +349,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 
			{

			j=bl-i;

			memcpy(&(ctx->buf[i]),in,j);

			if(!ctx->cipher->do_cipher(ctx,out,ctx->buf,bl)) return 0;

			if(!M_do_cipher(ctx,out,ctx->buf,bl)) return 0;

			inl-=j;

			in+=j;

			out+=bl;
@@ -345,7 +362,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 
	inl-=i;

	if (inl > 0)

		{

		if(!ctx->cipher->do_cipher(ctx,out,in,inl)) return 0;

		if(!M_do_cipher(ctx,out,in,inl)) return 0;

		*outl+=inl;

		}
@@ -367,6 +384,16 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 
	int n,ret;

	unsigned int i, b, bl;



	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

		{

		ret = M_do_cipher(ctx, out, NULL, 0);

		if (ret < 0)

			return 0;

		else 

			*outl = ret;

		return 1;

		}



	b=ctx->cipher->block_size;

	OPENSSL_assert(b <= sizeof ctx->buf);

	if (b == 1)
@@ -389,7 +416,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 
	n=b-bl;

	for (i=bl; i<b; i++)

		ctx->buf[i]=n;

	ret=ctx->cipher->do_cipher(ctx,out,ctx->buf,b);

	ret=M_do_cipher(ctx,out,ctx->buf,b);





	if(ret)
@@ -404,6 +431,19 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 
	int fix_len;

	unsigned int b;



	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

		{

		fix_len = M_do_cipher(ctx, out, in, inl);

		if (fix_len < 0)

			{

			*outl = 0;

			return 0;

			}

		else

			*outl = fix_len;

		return 1;

		}



	if (inl <= 0)

		{

		*outl = 0;
@@ -457,8 +497,18 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 
	{

	int i,n;

	unsigned int b;



	*outl=0;



	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

		{

		i = M_do_cipher(ctx, out, NULL, 0);

		if (i < 0)

			return 0;

		else

			*outl = i;

		return 1;

		}



	b=ctx->cipher->block_size;

	if (ctx->flags & EVP_CIPH_NO_PADDING)

		{
@@ -513,6 +563,7 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) 


int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)

	{

#ifndef OPENSSL_FIPS

	if (c->cipher != NULL)

		{

		if(c->cipher->cleanup && !c->cipher->cleanup(c))
@@ -523,11 +574,15 @@ int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) 
		}

	if (c->cipher_data)

		OPENSSL_free(c->cipher_data);

#endif

#ifndef OPENSSL_NO_ENGINE

	if (c->engine)

		/* The EVP_CIPHER we used belongs to an ENGINE, release the

		 * functional reference we held for this reason. */

		ENGINE_finish(c->engine);

#endif

#ifdef OPENSSL_FIPS

	FIPS_cipher_ctx_cleanup(c);

#endif

	memset(c,0,sizeof(EVP_CIPHER_CTX));

	return 1;