summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_clnt.c
diff options
context:
space:
mode:
authorjsing <>2017-01-23 04:15:28 +0000
committerjsing <>2017-01-23 04:15:28 +0000
commit0f157a9ac8d269cb234cff4f5cd07800027490ff (patch)
treed2bcfe381c02ccf528bdd3f18dcabbc4bec0aa3c /src/lib/libssl/d1_clnt.c
parentfdee32bae021d93d570e88a1dbbea0b3bad2c1e0 (diff)
downloadopenbsd-0f157a9ac8d269cb234cff4f5cd07800027490ff.tar.gz
openbsd-0f157a9ac8d269cb234cff4f5cd07800027490ff.tar.bz2
openbsd-0f157a9ac8d269cb234cff4f5cd07800027490ff.zip
Move callback function pointers and argument pointers from SSL_CTX to
internal. ok beck@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r--src/lib/libssl/d1_clnt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 71cd845ac6..127cda155c 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.63 2017/01/23 00:12:54 jsing Exp $ */ 1/* $OpenBSD: d1_clnt.c,v 1.64 2017/01/23 04:15:28 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.
@@ -190,8 +190,8 @@ dtls1_connect(SSL *s)
190 190
191 if (s->info_callback != NULL) 191 if (s->info_callback != NULL)
192 cb = s->info_callback; 192 cb = s->info_callback;
193 else if (s->ctx->info_callback != NULL) 193 else if (s->ctx->internal->info_callback != NULL)
194 cb = s->ctx->info_callback; 194 cb = s->ctx->internal->info_callback;
195 195
196 s->in_handshake++; 196 s->in_handshake++;
197 if (!SSL_in_init(s) || SSL_in_before(s)) 197 if (!SSL_in_init(s) || SSL_in_before(s))