wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops, restore change that got reverted accidentally.

Browse source
This commit is contained in:
Dr. Stephen Henson 2008-09-15 22:32:23 +00:00
parent 3fa1a444ce
commit f947b818bf
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crypto/evp/evp_enc.c
View file

@ -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;
*outl = 0;
return inl == 0;
}
if (ctx->flags & EVP_CIPH_NO_PADDING)