summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_srvr.c
diff options
context:
space:
mode:
authorbeck <>2017-01-23 04:55:27 +0000
committerbeck <>2017-01-23 04:55:27 +0000
commitc35f51566045be89c49b0a47e153fdb27ec20f8e (patch)
tree7b3e30aaa4ce396a0dcc28cc981628a669ff50d2 /src/lib/libssl/d1_srvr.c
parent0f157a9ac8d269cb234cff4f5cd07800027490ff (diff)
downloadopenbsd-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_srvr.c')
-rw-r--r--src/lib/libssl/d1_srvr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 28a4442445..80af8eb930 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_srvr.c,v 1.74 2017/01/23 04:15:28 jsing Exp $ */ 1/* $OpenBSD: d1_srvr.c,v 1.75 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,15 +188,15 @@ dtls1_accept(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 listen = D1I(s)->listen; 196 listen = D1I(s)->listen;
197 197
198 /* init things to blank */ 198 /* init things to blank */
199 s->in_handshake++; 199 s->internal->in_handshake++;
200 if (!SSL_in_init(s) || SSL_in_before(s)) 200 if (!SSL_in_init(s) || SSL_in_before(s))
201 SSL_clear(s); 201 SSL_clear(s);
202 202
@@ -643,7 +643,7 @@ dtls1_accept(SSL *s)
643 643
644 s->ctx->internal->stats.sess_accept_good++; 644 s->ctx->internal->stats.sess_accept_good++;
645 /* s->server=1; */ 645 /* s->server=1; */
646 s->handshake_func = dtls1_accept; 646 s->internal->handshake_func = dtls1_accept;
647 647
648 if (cb != NULL) 648 if (cb != NULL)
649 cb(s, SSL_CB_HANDSHAKE_DONE, 1); 649 cb(s, SSL_CB_HANDSHAKE_DONE, 1);
@@ -684,7 +684,7 @@ dtls1_accept(SSL *s)
684end: 684end:
685 /* BIO_flush(s->wbio); */ 685 /* BIO_flush(s->wbio); */
686 686
687 s->in_handshake--; 687 s->internal->in_handshake--;
688 688
689 if (cb != NULL) 689 if (cb != NULL)
690 cb(s, SSL_CB_ACCEPT_EXIT, ret); 690 cb(s, SSL_CB_ACCEPT_EXIT, ret);