diff options
author | Rich Salz <rsalz@akamai.com> | 2021-05-19 11:09:49 -0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-05-28 10:04:31 +0200 |
commit | a935791d54078f43209ffbc1886ac5e68772ce34 (patch) | |
tree | 3f130fe3e12b6671584ff421984542579d5268a8 /crypto/engine/eng_init.c | |
parent | 6bf3692d311ad15d3667e7015bbe1a8f849f3c7b (diff) | |
download | openssl-new-a935791d54078f43209ffbc1886ac5e68772ce34.tar.gz |
Rework and make DEBUG macros consistent.
Remove unused -DCONF_DEBUG and -DBN_CTX_DEBUG.
Rename REF_PRINT to REF_DEBUG for consistency, and add a new
tracing category and use it for printing reference counts.
Rename -DDEBUG_UNUSED to -DUNUSED_RESULT_DEBUG
Fix BN_DEBUG_RAND so it compiles and, when set, force DEBUG_RAND to
be set also.
Rename engine_debug_ref to be ENGINE_REF_PRINT also for consistency.
Fixes #15357
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15353)
Diffstat (limited to 'crypto/engine/eng_init.c')
-rw-r--r-- | crypto/engine/eng_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c index 20147a5263..c204eb1899 100644 --- a/crypto/engine/eng_init.c +++ b/crypto/engine/eng_init.c @@ -34,8 +34,8 @@ int engine_unlocked_init(ENGINE *e) */ e->struct_ref++; e->funct_ref++; - engine_ref_debug(e, 0, 1); - engine_ref_debug(e, 1, 1); + ENGINE_REF_PRINT(e, 0, 1); + ENGINE_REF_PRINT(e, 1, 1); } return to_return; } @@ -57,7 +57,7 @@ int engine_unlocked_finish(ENGINE *e, int unlock_for_handlers) * to 0 without either calling finish(). */ e->funct_ref--; - engine_ref_debug(e, 1, -1); + ENGINE_REF_PRINT(e, 1, -1); if ((e->funct_ref == 0) && e->finish) { if (unlock_for_handlers) CRYPTO_THREAD_unlock(global_engine_lock); |