diff options
author | jsing <> | 2017-01-23 00:12:55 +0000 |
---|---|---|
committer | jsing <> | 2017-01-23 00:12:55 +0000 |
commit | ebf810ecb3df5037cf52818180e9d1f9b811019d (patch) | |
tree | dbb00e45128efea271755d0b8b656130a43435f6 /src/lib/libssl/d1_clnt.c | |
parent | fcfe199cc99431d4e250ada852b3989b210b67ca (diff) | |
download | openbsd-ebf810ecb3df5037cf52818180e9d1f9b811019d.tar.gz openbsd-ebf810ecb3df5037cf52818180e9d1f9b811019d.tar.bz2 openbsd-ebf810ecb3df5037cf52818180e9d1f9b811019d.zip |
Move the stats struct from SSL_CTX to internal.
ok beck@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r-- | src/lib/libssl/d1_clnt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index af3196ff17..71cd845ac6 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_clnt.c,v 1.62 2017/01/22 09:02:07 jsing Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.63 2017/01/23 00:12:54 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -205,7 +205,7 @@ dtls1_connect(SSL *s) | |||
205 | case SSL_ST_RENEGOTIATE: | 205 | case SSL_ST_RENEGOTIATE: |
206 | s->renegotiate = 1; | 206 | s->renegotiate = 1; |
207 | s->state = SSL_ST_CONNECT; | 207 | s->state = SSL_ST_CONNECT; |
208 | s->ctx->stats.sess_connect_renegotiate++; | 208 | s->ctx->internal->stats.sess_connect_renegotiate++; |
209 | /* break */ | 209 | /* break */ |
210 | case SSL_ST_BEFORE: | 210 | case SSL_ST_BEFORE: |
211 | case SSL_ST_CONNECT: | 211 | case SSL_ST_CONNECT: |
@@ -242,7 +242,7 @@ dtls1_connect(SSL *s) | |||
242 | /* don't push the buffering BIO quite yet */ | 242 | /* don't push the buffering BIO quite yet */ |
243 | 243 | ||
244 | s->state = SSL3_ST_CW_CLNT_HELLO_A; | 244 | s->state = SSL3_ST_CW_CLNT_HELLO_A; |
245 | s->ctx->stats.sess_connect++; | 245 | s->ctx->internal->stats.sess_connect++; |
246 | s->init_num = 0; | 246 | s->init_num = 0; |
247 | /* mark client_random uninitialized */ | 247 | /* mark client_random uninitialized */ |
248 | memset(s->s3->client_random, 0, | 248 | memset(s->s3->client_random, 0, |
@@ -555,12 +555,12 @@ dtls1_connect(SSL *s) | |||
555 | 555 | ||
556 | ssl_update_cache(s, SSL_SESS_CACHE_CLIENT); | 556 | ssl_update_cache(s, SSL_SESS_CACHE_CLIENT); |
557 | if (s->hit) | 557 | if (s->hit) |
558 | s->ctx->stats.sess_hit++; | 558 | s->ctx->internal->stats.sess_hit++; |
559 | 559 | ||
560 | ret = 1; | 560 | ret = 1; |
561 | /* s->server=0; */ | 561 | /* s->server=0; */ |
562 | s->handshake_func = dtls1_connect; | 562 | s->handshake_func = dtls1_connect; |
563 | s->ctx->stats.sess_connect_good++; | 563 | s->ctx->internal->stats.sess_connect_good++; |
564 | 564 | ||
565 | if (cb != NULL) | 565 | if (cb != NULL) |
566 | cb(s, SSL_CB_HANDSHAKE_DONE, 1); | 566 | cb(s, SSL_CB_HANDSHAKE_DONE, 1); |