[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[kaduk at mit.edu]

The branch OpenSSL_1_1_0-stable has been updated
       via  a4110310ea6879622516294b9fc7ef6e2f815c1c (commit)
      from  eea5f335b81d89554272a1fab8de9e40656509da (commit)


- Log -----------------------------------------------------------------
commit a4110310ea6879622516294b9fc7ef6e2f815c1c
Author: Emeric Brun <ebrun at haproxy.com>
Date:   Wed Jul 26 15:59:21 2017 +0200

    Fix async engine pause dead lock in error case.
    
    In 'crypto/rand/ossl_rand.c', a call to
    'ASYNC_unblock_pause()' is missing in an error case.
    
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    
    (cherry picked from commit e4b16013e9b3d19241d3ba0bb0875f0d70d93509)
    
    (Merged from https://github.com/openssl/openssl/pull/4024)

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

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

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 85ce4e6..fee722a 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -492,6 +492,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo)
      */
     ASYNC_block_pause();
     if (!MD_Update(m, md, MD_DIGEST_LENGTH) || !MD_Final(m, md)) {
+        ASYNC_unblock_pause();
         CRYPTO_THREAD_unlock(rand_lock);
         goto err;
     }