Do not set load_crypto_strings_inited when OPENSSL_NO_ERR is defined
authorMat <mberchtold@gmail.com>
Mon, 3 Oct 2016 03:40:32 +0000 (05:40 +0200)
committerRich Salz <rsalz@openssl.org>
Wed, 19 Oct 2016 11:03:04 +0000 (07:03 -0400)
commit3d040392ff68e71171cbd5750f1d76efdb0516ca
tree71c24d23c6d4b5ebf9f71b8f84754dc2c415a702
parentc347c5a3b6d51cbd24cfab45ab2698c7757a3ffc
Do not set load_crypto_strings_inited when OPENSSL_NO_ERR is defined

Only set the load_crypto_strings_inited to 1 when err_load_crypto_strings_int was called.

This solves the following issue:
- openssl is built with no-err
- load_crypto_strings_inited is set to 1 during the OPENSSL_init_crypto call
- During the cleanup: OPENSSL_cleanup, err_free_strings_int is called because load_crypto_strings_inited == 1
- err_free_strings_int calls do_err_strings_init because it has never been called
- Now do_err_strings_init calls OPENSSL_init_crypto
- But since we are in the cleanup (stopped == 1) this results in an error:
  CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL);
- which then tries to initialize everything we are trying to clean up: ERR_get_state, ossl_init_thread_start, etc
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1654)
(cherry picked from commit a1f2b0e6e07a53c0ae2c81cba319b90e54210cd6)
crypto/init.c