[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  ee6ce5cc368574c0b0b470e61ee2f82a0efadbb7 (commit)
      from  ba1a1c3783bec68830da3a375b581afc73226ff4 (commit)


- Log -----------------------------------------------------------------
commit ee6ce5cc368574c0b0b470e61ee2f82a0efadbb7
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jul 26 16:51:49 2016 +0100

    Set error if EVP_CipherUpdate fails.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/bio_enc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 5a4d9c5..d1422f0 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -163,6 +163,7 @@ static int enc_read(BIO *b, char *out, int outl)
                                   (unsigned char *)&(ctx->buf[BUF_OFFSET]),
                                   i)) {
                 BIO_clear_retry_flags(b);
+                ctx->ok = 0;
                 return 0;
             }
             ctx->cont = 1;