diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-07-29 14:12:53 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-08-07 09:08:23 +0200 |
| commit | 9ef9088c1585e13b9727796f15f77da64dbbe623 (patch) | |
| tree | d19a8b9c42b0226d785889655af053c24ee86af6 /ssl/statem/extensions.c | |
| parent | cab76c0f6482df5140efa2ca93c9e2d972fcd9b0 (diff) | |
ssl/*: switch to switch to Thread-Sanitizer-friendly primitives.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6786)
Diffstat (limited to 'ssl/statem/extensions.c')
| -rw-r--r-- | ssl/statem/extensions.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 85945acc0d..12c712e8e6 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -912,7 +912,7 @@ static int init_server_name(SSL *s, unsigned int context) static int final_server_name(SSL *s, unsigned int context, int sent) { - int ret = SSL_TLSEXT_ERR_NOACK, discard; + int ret = SSL_TLSEXT_ERR_NOACK; int altmp = SSL_AD_UNRECOGNIZED_NAME; int was_ticket = (SSL_get_options(s) & SSL_OP_NO_TICKET) == 0; @@ -960,10 +960,8 @@ static int final_server_name(SSL *s, unsigned int context, int sent) * exceed sess_accept (zero) for the new context. */ if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx) { - CRYPTO_atomic_add(&s->ctx->stats.sess_accept, 1, &discard, - s->ctx->lock); - CRYPTO_atomic_add(&s->session_ctx->stats.sess_accept, -1, &discard, - s->session_ctx->lock); + tsan_counter(&s->ctx->stats.sess_accept); + tsan_counter(&s->session_ctx->stats.sess_accept); } /* |