diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2019-08-10 16:51:12 +0200 |
|---|---|---|
| committer | Paul Yang <kaishen.yy@antfin.com> | 2019-08-20 11:16:41 +0800 |
| commit | cf0932cdd94f067ed18ce78bea038d919f69038f (patch) | |
| tree | f6bc014904f5dc9e4b90d973b3c213dc1df85638 /crypto/init.c | |
| parent | c85d5e025797f4e77c2166150bbf8745e9d00696 (diff) | |
prevent endless recursion when trace API is used within OPENSSL_init_crypto()
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
(Merged from https://github.com/openssl/openssl/pull/9567)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index 04fd33087a..d4da7b27e3 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -44,8 +44,7 @@ static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT; static int base_inited = 0; DEFINE_RUN_ONCE_STATIC(ossl_init_base) { - if (ossl_trace_init() == 0) - return 0; + /* no need to init trace */ OSSL_TRACE(INIT, "ossl_init_base: setting up stop handlers\n"); #ifndef OPENSSL_NO_CRYPTO_MDEBUG |