diff options
author | jsing <> | 2017-01-23 04:15:28 +0000 |
---|---|---|
committer | jsing <> | 2017-01-23 04:15:28 +0000 |
commit | 779cc82ab96e48a0162ed5caa96bbc04dd3a5c72 (patch) | |
tree | d2bcfe381c02ccf528bdd3f18dcabbc4bec0aa3c /src/lib/libssl/d1_clnt.c | |
parent | 8c3e82ca039c1de2d07ceb9033058fc6bb5791a2 (diff) | |
download | openbsd-779cc82ab96e48a0162ed5caa96bbc04dd3a5c72.tar.gz openbsd-779cc82ab96e48a0162ed5caa96bbc04dd3a5c72.tar.bz2 openbsd-779cc82ab96e48a0162ed5caa96bbc04dd3a5c72.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.c | 6 |
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)) |