diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 96aea4c5dd..f4bb212865 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.129 2017/01/22 09:02:07 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.130 2017/01/23 00:12:54 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 | * |
@@ -1157,27 +1157,27 @@ SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | |||
1157 | case SSL_CTRL_SESS_NUMBER: | 1157 | case SSL_CTRL_SESS_NUMBER: |
1158 | return (lh_SSL_SESSION_num_items(ctx->sessions)); | 1158 | return (lh_SSL_SESSION_num_items(ctx->sessions)); |
1159 | case SSL_CTRL_SESS_CONNECT: | 1159 | case SSL_CTRL_SESS_CONNECT: |
1160 | return (ctx->stats.sess_connect); | 1160 | return (ctx->internal->stats.sess_connect); |
1161 | case SSL_CTRL_SESS_CONNECT_GOOD: | 1161 | case SSL_CTRL_SESS_CONNECT_GOOD: |
1162 | return (ctx->stats.sess_connect_good); | 1162 | return (ctx->internal->stats.sess_connect_good); |
1163 | case SSL_CTRL_SESS_CONNECT_RENEGOTIATE: | 1163 | case SSL_CTRL_SESS_CONNECT_RENEGOTIATE: |
1164 | return (ctx->stats.sess_connect_renegotiate); | 1164 | return (ctx->internal->stats.sess_connect_renegotiate); |
1165 | case SSL_CTRL_SESS_ACCEPT: | 1165 | case SSL_CTRL_SESS_ACCEPT: |
1166 | return (ctx->stats.sess_accept); | 1166 | return (ctx->internal->stats.sess_accept); |
1167 | case SSL_CTRL_SESS_ACCEPT_GOOD: | 1167 | case SSL_CTRL_SESS_ACCEPT_GOOD: |
1168 | return (ctx->stats.sess_accept_good); | 1168 | return (ctx->internal->stats.sess_accept_good); |
1169 | case SSL_CTRL_SESS_ACCEPT_RENEGOTIATE: | 1169 | case SSL_CTRL_SESS_ACCEPT_RENEGOTIATE: |
1170 | return (ctx->stats.sess_accept_renegotiate); | 1170 | return (ctx->internal->stats.sess_accept_renegotiate); |
1171 | case SSL_CTRL_SESS_HIT: | 1171 | case SSL_CTRL_SESS_HIT: |
1172 | return (ctx->stats.sess_hit); | 1172 | return (ctx->internal->stats.sess_hit); |
1173 | case SSL_CTRL_SESS_CB_HIT: | 1173 | case SSL_CTRL_SESS_CB_HIT: |
1174 | return (ctx->stats.sess_cb_hit); | 1174 | return (ctx->internal->stats.sess_cb_hit); |
1175 | case SSL_CTRL_SESS_MISSES: | 1175 | case SSL_CTRL_SESS_MISSES: |
1176 | return (ctx->stats.sess_miss); | 1176 | return (ctx->internal->stats.sess_miss); |
1177 | case SSL_CTRL_SESS_TIMEOUTS: | 1177 | case SSL_CTRL_SESS_TIMEOUTS: |
1178 | return (ctx->stats.sess_timeout); | 1178 | return (ctx->internal->stats.sess_timeout); |
1179 | case SSL_CTRL_SESS_CACHE_FULL: | 1179 | case SSL_CTRL_SESS_CACHE_FULL: |
1180 | return (ctx->stats.sess_cache_full); | 1180 | return (ctx->internal->stats.sess_cache_full); |
1181 | case SSL_CTRL_OPTIONS: | 1181 | case SSL_CTRL_OPTIONS: |
1182 | return (ctx->options|=larg); | 1182 | return (ctx->options|=larg); |
1183 | case SSL_CTRL_CLEAR_OPTIONS: | 1183 | case SSL_CTRL_CLEAR_OPTIONS: |
@@ -1836,7 +1836,7 @@ SSL_CTX_new(const SSL_METHOD *meth) | |||
1836 | ret->get_session_cb = 0; | 1836 | ret->get_session_cb = 0; |
1837 | ret->generate_session_id = 0; | 1837 | ret->generate_session_id = 0; |
1838 | 1838 | ||
1839 | memset((char *)&ret->stats, 0, sizeof(ret->stats)); | 1839 | memset((char *)&ret->internal->stats, 0, sizeof(ret->internal->stats)); |
1840 | 1840 | ||
1841 | ret->references = 1; | 1841 | ret->references = 1; |
1842 | ret->quiet_shutdown = 0; | 1842 | ret->quiet_shutdown = 0; |
@@ -2285,8 +2285,8 @@ ssl_update_cache(SSL *s, int mode) | |||
2285 | if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) && | 2285 | if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) && |
2286 | ((i & mode) == mode)) { | 2286 | ((i & mode) == mode)) { |
2287 | if ((((mode & SSL_SESS_CACHE_CLIENT) ? | 2287 | if ((((mode & SSL_SESS_CACHE_CLIENT) ? |
2288 | s->session_ctx->stats.sess_connect_good : | 2288 | s->session_ctx->internal->stats.sess_connect_good : |
2289 | s->session_ctx->stats.sess_accept_good) & 0xff) == 0xff) { | 2289 | s->session_ctx->internal->stats.sess_accept_good) & 0xff) == 0xff) { |
2290 | SSL_CTX_flush_sessions(s->session_ctx, time(NULL)); | 2290 | SSL_CTX_flush_sessions(s->session_ctx, time(NULL)); |
2291 | } | 2291 | } |
2292 | } | 2292 | } |