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

Set error if EVP_CipherUpdate fails. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit ee6ce5cc)

Conflicts:
	crypto/evp/bio_enc.c
parent 325da823

crypto/evp/bio_enc.c

+8 −3
Original line number Diff line number Diff line
@@ -201,9 +201,14 @@ static int enc_read(BIO *b, char *out, int outl) 
                break;

            }

        } else {

            EVP_CipherUpdate(&(ctx->cipher),

            if (!EVP_CipherUpdate(&ctx->cipher,

                                  (unsigned char *)ctx->buf, &ctx->buf_len,

                             (unsigned char *)&(ctx->buf[BUF_OFFSET]), i);

                                  (unsigned char *)&(ctx->buf[BUF_OFFSET]),

                                  i)) {

                BIO_clear_retry_flags(b);

                ctx->ok = 0;

                return 0;

            }

            ctx->cont = 1;

            /*

             * Note: it is possible for EVP_CipherUpdate to decrypt zero