summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s23_srvr.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/s23_srvr.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/s23_srvr.c')
-rw-r--r--src/lib/libssl/s23_srvr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index e4cb633d06..88ff9bb9a8 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s23_srvr.c,v 1.51 2017/01/23 00:12:54 jsing Exp $ */ 1/* $OpenBSD: s23_srvr.c,v 1.52 2017/01/23 04:15:28 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -131,8 +131,8 @@ ssl23_accept(SSL *s)
131 131
132 if (s->info_callback != NULL) 132 if (s->info_callback != NULL)
133 cb = s->info_callback; 133 cb = s->info_callback;
134 else if (s->ctx->info_callback != NULL) 134 else if (s->ctx->internal->info_callback != NULL)
135 cb = s->ctx->info_callback; 135 cb = s->ctx->internal->info_callback;
136 136
137 s->in_handshake++; 137 s->in_handshake++;
138 if (!SSL_in_init(s) || SSL_in_before(s)) 138 if (!SSL_in_init(s) || SSL_in_before(s))