The branch master has been updated via e3af453baceee7401ba0c5044a4c3aeaf246406f (commit) from 0f5163bd1c9d993ec54b690b9da8d13efe089be0 (commit)
- Log ----------------------------------------------------------------- commit e3af453baceee7401ba0c5044a4c3aeaf246406f Author: Richard Levitte <levi...@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 <m...@openssl.org> Reviewed-by: Paul Dale <paul.d...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8679) ----------------------------------------------------------------------- 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 463da98..43fe1a6 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -670,7 +670,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; }