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

Update from stable branch.

parent c9a0ab49

crypto/evp/evp_enc.c

+9 −4
Original line number Diff line number Diff line
@@ -143,7 +143,12 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 
	{

	int i,j,bl;



	OPENSSL_assert(inl > 0);

	if (inl <= 0)

		{

		*outl = 0;

		return inl == 0;

		}



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

		{

		if(M_do_cipher(ctx,out,in,inl))
@@ -245,10 +250,10 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 
	int fix_len;

	unsigned int b;



	if (inl == 0)

	if (inl <= 0)

		{

		*outl = 0;

		return 1;

		return inl == 0;

		}



	if (ctx->flags & EVP_CIPH_NO_PADDING)