[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  e4b16013e9b3d19241d3ba0bb0875f0d70d93509 (commit)
      from  a58eb06d527c86492d4205feeb0e20bf19a1181d (commit)


- Log -----------------------------------------------------------------
commit e4b16013e9b3d19241d3ba0bb0875f0d70d93509
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>
    (Merged from https://github.com/openssl/openssl/pull/4020)

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

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

diff --git a/crypto/rand/ossl_rand.c b/crypto/rand/ossl_rand.c
index 1b4b21b..119c2b4 100644
--- a/crypto/rand/ossl_rand.c
+++ b/crypto/rand/ossl_rand.c
@@ -485,6 +485,7 @@ static int rand_bytes(unsigned char *buf, int num)
     ASYNC_block_pause();
     if (!EVP_DigestUpdate(m, sp->md, sizeof(sp->md))
             || !EVP_DigestFinal_ex(m, sp->md, NULL)) {
+        ASYNC_unblock_pause();
         CRYPTO_THREAD_unlock(rand_lock);
         goto err;
     }