diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2017-01-23 04:55:28 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2017-01-23 04:55:28 +0000 |
| commit | 67ff62bca36ce39cc26aa4964e38e6199972a3d2 (patch) | |
| tree | e667b03ae4f4ffbcb00d2b837875f63e8249dcd1 /lib/libssl/d1_clnt.c | |
| parent | f989acd01278a89c78176bfde9b8ab9d0e91a569 (diff) | |
move the callbacks from ssl_st to internal
ok jsing@
Diffstat (limited to 'lib/libssl/d1_clnt.c')
| -rw-r--r-- | lib/libssl/d1_clnt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/d1_clnt.c b/lib/libssl/d1_clnt.c index 127cda155c1..67b874ef6b6 100644 --- a/lib/libssl/d1_clnt.c +++ b/lib/libssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.64 2017/01/23 04:15:28 jsing Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.65 2017/01/23 04:55:26 beck Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -188,12 +188,12 @@ dtls1_connect(SSL *s) ERR_clear_error(); errno = 0; - if (s->info_callback != NULL) - cb = s->info_callback; + if (s->internal->info_callback != NULL) + cb = s->internal->info_callback; else if (s->ctx->internal->info_callback != NULL) cb = s->ctx->internal->info_callback; - s->in_handshake++; + s->internal->in_handshake++; if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); @@ -559,7 +559,7 @@ dtls1_connect(SSL *s) ret = 1; /* s->server=0; */ - s->handshake_func = dtls1_connect; + s->internal->handshake_func = dtls1_connect; s->ctx->internal->stats.sess_connect_good++; if (cb != NULL) @@ -596,7 +596,7 @@ dtls1_connect(SSL *s) } end: - s->in_handshake--; + s->internal->in_handshake--; if (cb != NULL) cb(s, SSL_CB_CONNECT_EXIT, ret); |