diff options
author | beck <> | 2017-01-23 04:55:27 +0000 |
---|---|---|
committer | beck <> | 2017-01-23 04:55:27 +0000 |
commit | c35f51566045be89c49b0a47e153fdb27ec20f8e (patch) | |
tree | 7b3e30aaa4ce396a0dcc28cc981628a669ff50d2 /src/lib/libssl/d1_clnt.c | |
parent | 0f157a9ac8d269cb234cff4f5cd07800027490ff (diff) | |
download | openbsd-c35f51566045be89c49b0a47e153fdb27ec20f8e.tar.gz openbsd-c35f51566045be89c49b0a47e153fdb27ec20f8e.tar.bz2 openbsd-c35f51566045be89c49b0a47e153fdb27ec20f8e.zip |
move the callbacks from ssl_st to internal
ok jsing@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r-- | src/lib/libssl/d1_clnt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 127cda155c..67b874ef6b 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.64 2017/01/23 04:15:28 jsing Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.65 2017/01/23 04:55:26 beck 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. |
@@ -188,12 +188,12 @@ dtls1_connect(SSL *s) | |||
188 | ERR_clear_error(); | 188 | ERR_clear_error(); |
189 | errno = 0; | 189 | errno = 0; |
190 | 190 | ||
191 | if (s->info_callback != NULL) | 191 | if (s->internal->info_callback != NULL) |
192 | cb = s->info_callback; | 192 | cb = s->internal->info_callback; |
193 | else if (s->ctx->internal->info_callback != NULL) | 193 | else if (s->ctx->internal->info_callback != NULL) |
194 | cb = s->ctx->internal->info_callback; | 194 | cb = s->ctx->internal->info_callback; |
195 | 195 | ||
196 | s->in_handshake++; | 196 | s->internal->in_handshake++; |
197 | if (!SSL_in_init(s) || SSL_in_before(s)) | 197 | if (!SSL_in_init(s) || SSL_in_before(s)) |
198 | SSL_clear(s); | 198 | SSL_clear(s); |
199 | 199 | ||
@@ -559,7 +559,7 @@ dtls1_connect(SSL *s) | |||
559 | 559 | ||
560 | ret = 1; | 560 | ret = 1; |
561 | /* s->server=0; */ | 561 | /* s->server=0; */ |
562 | s->handshake_func = dtls1_connect; | 562 | s->internal->handshake_func = dtls1_connect; |
563 | s->ctx->internal->stats.sess_connect_good++; | 563 | s->ctx->internal->stats.sess_connect_good++; |
564 | 564 | ||
565 | if (cb != NULL) | 565 | if (cb != NULL) |
@@ -596,7 +596,7 @@ dtls1_connect(SSL *s) | |||
596 | } | 596 | } |
597 | 597 | ||
598 | end: | 598 | end: |
599 | s->in_handshake--; | 599 | s->internal->in_handshake--; |
600 | if (cb != NULL) | 600 | if (cb != NULL) |
601 | cb(s, SSL_CB_CONNECT_EXIT, ret); | 601 | cb(s, SSL_CB_CONNECT_EXIT, ret); |
602 | 602 | ||