diff options
| author | jsing <> | 2017-01-23 00:12:55 +0000 |
|---|---|---|
| committer | jsing <> | 2017-01-23 00:12:55 +0000 |
| commit | c382752686f32d987502d0859d7206b0c48932c1 (patch) | |
| tree | dbb00e45128efea271755d0b8b656130a43435f6 /src/lib/libssl/ssl_sess.c | |
| parent | bd2d858e0149e88f8fe4f0124d9b1e4d22553fd1 (diff) | |
| download | openbsd-c382752686f32d987502d0859d7206b0c48932c1.tar.gz openbsd-c382752686f32d987502d0859d7206b0c48932c1.tar.bz2 openbsd-c382752686f32d987502d0859d7206b0c48932c1.zip | |
Move the stats struct from SSL_CTX to internal.
ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index dc4894c64c..7f03d12d35 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_sess.c,v 1.55 2017/01/22 05:14:42 beck Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.56 2017/01/23 00:12:55 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -466,7 +466,7 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | |||
| 466 | CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX); | 466 | CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX); |
| 467 | 467 | ||
| 468 | if (ret == NULL) | 468 | if (ret == NULL) |
| 469 | s->session_ctx->stats.sess_miss++; | 469 | s->session_ctx->internal->stats.sess_miss++; |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | if (try_session_cache && ret == NULL && | 472 | if (try_session_cache && ret == NULL && |
| @@ -475,7 +475,7 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | |||
| 475 | 475 | ||
| 476 | if ((ret = s->session_ctx->get_session_cb(s, session_id, | 476 | if ((ret = s->session_ctx->get_session_cb(s, session_id, |
| 477 | len, ©))) { | 477 | len, ©))) { |
| 478 | s->session_ctx->stats.sess_cb_hit++; | 478 | s->session_ctx->internal->stats.sess_cb_hit++; |
| 479 | 479 | ||
| 480 | /* | 480 | /* |
| 481 | * Increment reference count now if the session | 481 | * Increment reference count now if the session |
| @@ -542,7 +542,7 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | |||
| 542 | 542 | ||
| 543 | if (ret->timeout < (time(NULL) - ret->time)) { | 543 | if (ret->timeout < (time(NULL) - ret->time)) { |
| 544 | /* timeout */ | 544 | /* timeout */ |
| 545 | s->session_ctx->stats.sess_timeout++; | 545 | s->session_ctx->internal->stats.sess_timeout++; |
| 546 | if (try_session_cache) { | 546 | if (try_session_cache) { |
| 547 | /* session was from the cache, so remove it */ | 547 | /* session was from the cache, so remove it */ |
| 548 | SSL_CTX_remove_session(s->session_ctx, ret); | 548 | SSL_CTX_remove_session(s->session_ctx, ret); |
| @@ -550,7 +550,7 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | |||
| 550 | goto err; | 550 | goto err; |
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | s->session_ctx->stats.sess_hit++; | 553 | s->session_ctx->internal->stats.sess_hit++; |
| 554 | 554 | ||
| 555 | if (s->session != NULL) | 555 | if (s->session != NULL) |
| 556 | SSL_SESSION_free(s->session); | 556 | SSL_SESSION_free(s->session); |
| @@ -641,7 +641,7 @@ SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *c) | |||
| 641 | ctx->session_cache_tail, 0)) | 641 | ctx->session_cache_tail, 0)) |
| 642 | break; | 642 | break; |
| 643 | else | 643 | else |
| 644 | ctx->stats.sess_cache_full++; | 644 | ctx->internal->stats.sess_cache_full++; |
| 645 | } | 645 | } |
| 646 | } | 646 | } |
| 647 | } | 647 | } |
