diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-09-15 22:03:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-09-15 22:03:18 +0000 |
| commit | f97b8f3114dcd2dc5a4883f0824b53d2bcef1390 (patch) | |
| tree | 1faa3ab03995fbd09385b3fbc806041fc0c62aed | |
| parent | c9a0ab4907fae6288a100e2efcd3e8bcce48eaec (diff) | |
Update from stable branch.
| -rw-r--r-- | crypto/evp/evp_enc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 304ce7ea68..30e0ca4d9f 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -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) |