mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-25 02:53:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make EVP_DecryptUpdate work again.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-10-02 16:19:49 +00:00
parent 3d90a32429
commit f329b8d73b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crypto/evp/evp_enc.c
View File

@ -302,7 +302,7 @@ int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
const unsigned char *in, int inl)
{
int b;
int b, fix_len;
if (inl == 0)
{
@ -314,12 +314,17 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
return EVP_EncryptUpdate(ctx, out, outl, in, inl);
b=ctx->cipher->block_size;
if(ctx->final_used)
{
memcpy(out,ctx->final,b);
out+=b;
fix_len = 1;
}
else
fix_len = 0;
if(!EVP_EncryptUpdate(ctx,out,outl,in,inl))
return 0;
@ -327,18 +332,16 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
* we have a copy of this last block */
if (b > 1 && !ctx->buf_len)
{
if(!ctx->final_used)
{
*outl-=b;
ctx->final_used=1;
}
*outl-=b;
ctx->final_used=1;
memcpy(ctx->final,&out[*outl],b);
}
else if(ctx->final_used)
{
ctx->final_used=0;
*outl+=b;
}
else
ctx->final_used = 0;
if (fix_len)
*outl += b;
return 1;
}