ssl_sess.c

Timestamp:

Mar 31, 2022 9:00:36 AM (3 years ago)

Author:

vboxsync

Message:

libs/openssl: Update to 3.0.2 and switch to it, bugref:10128

Location:

trunk/src/libs/openssl-3.0.2

Files:

: 2 edited

. (modified) (1 prop)
ssl/ssl_sess.c (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/src/libs/openssl-3.0.2

Property svn:mergeinfo

old	new
13	13	/vendor/openssl/1.1.1k:145841-145843
14	14	/vendor/openssl/3.0.1:150323-150324
15		/vendor/openssl/current:147554-150322
	15	/vendor/openssl/3.0.2:150728-150729
	16	/vendor/openssl/current:147554-150727

trunk/src/libs/openssl-3.0.2/ssl/ssl_sess.c

-              r94082
+              r94404
 /*
  * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
+ *
 …
         CRYPTO_THREAD_unlock(s->session_ctx->lock);
         if (ret == NULL)
             tsan_counter(&s->session_ctx->stats.sess_miss);
+            ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_miss);
+    }
 …
         if (ret != NULL) {
+            tsan_counter(&s->session_ctx->stats.sess_cb_hit);
+            ssl_tsan_counter(s->session_ctx,
+                             &s->session_ctx->stats.sess_cb_hit);
             /*
 …
     if (sess_timedout(time(NULL), ret)) {
         tsan_counter(&s->session_ctx->stats.sess_timeout);
+        ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_timeout);
         if (try_session_cache) {
             /* session was from the cache, so remove it */
 …
+    }
     tsan_counter(&s->session_ctx->stats.sess_hit);
+    ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_hit);
     s->verify_result = s->session->verify_result;
     return 1;
 …
                     break;
                 else
                     tsan_counter(&ctx->stats.sess_cache_full);
+                    ssl_tsan_counter(ctx, &ctx->stats.sess_cache_full);
+            }
+        }

Note: See TracChangeset for help on using the changeset viewer.

Changeset 94404 in vbox for trunk/src/libs/openssl-3.0.2/ssl/ssl_sess.c

Legend:

trunk/src/libs/openssl-3.0.2

trunk/src/libs/openssl-3.0.2/ssl/ssl_sess.c

Download in other formats: