[openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  b7534359306754b90a4f18aa5231477510488713 (commit)
      from  c15ef410e1898224736813b8b8e50caf7e5eadba (commit)


- Log -----------------------------------------------------------------
commit b7534359306754b90a4f18aa5231477510488713
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Apr 5 10:28:32 2019 +0200

    OPENSSL_init_crypto(): check config return code correctly
    
    It was assumed that the config functionality returned a boolean.
    However, it may return a negative number on error, so we need to take
    that into account.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8679)
    
    (cherry picked from commit e3af453baceee7401ba0c5044a4c3aeaf246406f)

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

Summary of changes:
 crypto/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/init.c b/crypto/init.c
index dc6ec39..afb2133 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -702,7 +702,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
         ret = RUN_ONCE(&config, ossl_init_config);
         conf_settings = NULL;
         CRYPTO_THREAD_unlock(init_lock);
-        if (!ret)
+        if (ret <= 0)
             return 0;
     }