diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-30 12:04:25 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-11 12:40:32 -0500 |
| commit | f3f1cf8444f439c0be9de04bf3821a20d00fd956 (patch) | |
| tree | 50d0fc624d4680e6cd734328126cd60a9dc128be /ssl | |
| parent | 7823d792d0cad3b44ad5389a8d3381becefe7f44 (diff) | |
Move to REF_DEBUG, for consistency.
Add utility macros REF_ASSERT_NOT and REF_PRINT_COUNT
This is also RT 4181
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_cert.c | 11 | ||||
| -rw-r--r-- | ssl/ssl_conf.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 31 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 11 |
4 files changed, 14 insertions, 42 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index dc58e25752..cc82fff423 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -335,17 +335,10 @@ void ssl_cert_free(CERT *c) return; i = CRYPTO_add(&c->references, -1, CRYPTO_LOCK_SSL_CERT); -#ifdef REF_PRINT - REF_PRINT("CERT", c); -#endif + REF_PRINT_COUNT("CERT", c); if (i > 0) return; -#ifdef REF_CHECK - if (i < 0) { - fprintf(stderr, "ssl_cert_free, bad reference count\n"); - abort(); /* ok */ - } -#endif + REF_ASSERT_ISNT(i < 0); #ifndef OPENSSL_NO_DH EVP_PKEY_free(c->dh_tmp); diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 1846155424..809ce7a872 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -55,9 +55,6 @@ * */ -#ifdef REF_CHECK -# include <assert.h> -#endif #include <stdio.h> #include "ssl_locl.h" #include <openssl/conf.h> diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index d0802207ce..c7d178da89 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -142,7 +142,7 @@ * OTHERWISE. */ -#ifdef REF_CHECK +#ifdef REF_DEBUG # include <assert.h> #endif #include <stdio.h> @@ -995,17 +995,10 @@ void SSL_free(SSL *s) return; i = CRYPTO_add(&s->references, -1, CRYPTO_LOCK_SSL); -#ifdef REF_PRINT - REF_PRINT("SSL", s); -#endif + REF_PRINT_COUNT("SSL", s); if (i > 0) return; -#ifdef REF_CHECK - if (i < 0) { - fprintf(stderr, "SSL_free, bad reference count\n"); - abort(); /* ok */ - } -#endif + REF_ASSERT_ISNT(i < 0); X509_VERIFY_PARAM_free(s->param); dane_final(&s->dane); @@ -2400,17 +2393,10 @@ void SSL_CTX_free(SSL_CTX *a) return; i = CRYPTO_add(&a->references, -1, CRYPTO_LOCK_SSL_CTX); -#ifdef REF_PRINT - REF_PRINT("SSL_CTX", a); -#endif + REF_PRINT_COUNT("SSL_CTX", a); if (i > 0) return; -#ifdef REF_CHECK - if (i < 0) { - fprintf(stderr, "SSL_CTX_free, bad reference count\n"); - abort(); /* ok */ - } -#endif + REF_ASSERT_ISNT(i < 0); X509_VERIFY_PARAM_free(a->param); dane_ctx_final(&a->dane); @@ -3274,8 +3260,11 @@ void ssl_free_wbio_buffer(SSL *s) if (s->bbio == s->wbio) { /* remove buffering */ s->wbio = BIO_pop(s->wbio); -#ifdef REF_CHECK /* not the usual REF_CHECK, but this avoids - * adding one more preprocessor symbol */ +#ifdef REF_DEBUG + /* + * not the usual REF_DEBUG, but this avoids + * adding one more preprocessor symbol + */ assert(s->wbio != NULL); #endif } diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 85f6c7ff67..97f3ce2480 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -814,17 +814,10 @@ void SSL_SESSION_free(SSL_SESSION *ss) return; i = CRYPTO_add(&ss->references, -1, CRYPTO_LOCK_SSL_SESSION); -#ifdef REF_PRINT - REF_PRINT("SSL_SESSION", ss); -#endif + REF_PRINT_COUNT("SSL_SESSION", ss); if (i > 0) return; -#ifdef REF_CHECK - if (i < 0) { - fprintf(stderr, "SSL_SESSION_free, bad reference count\n"); - abort(); /* ok */ - } -#endif + REF_ASSERT_ISNT(i < 0); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); |