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/s23_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/s23_clnt.c')
| -rw-r--r-- | src/lib/libssl/s23_clnt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index a7ad53fd98..56c1d53707 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s23_clnt.c,v 1.50 2017/01/23 00:12:54 jsing Exp $ */ | 1 | /* $OpenBSD: s23_clnt.c,v 1.51 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 | * |
| @@ -132,8 +132,8 @@ ssl23_connect(SSL *s) | |||
| 132 | 132 | ||
| 133 | if (s->info_callback != NULL) | 133 | if (s->info_callback != NULL) |
| 134 | cb = s->info_callback; | 134 | cb = s->info_callback; |
| 135 | else if (s->ctx->info_callback != NULL) | 135 | else if (s->ctx->internal->info_callback != NULL) |
| 136 | cb = s->ctx->info_callback; | 136 | cb = s->ctx->internal->info_callback; |
| 137 | 137 | ||
| 138 | s->in_handshake++; | 138 | s->in_handshake++; |
| 139 | if (!SSL_in_init(s) || SSL_in_before(s)) | 139 | if (!SSL_in_init(s) || SSL_in_before(s)) |
| @@ -396,8 +396,8 @@ ssl23_get_server_hello(SSL *s) | |||
| 396 | 396 | ||
| 397 | if (s->info_callback != NULL) | 397 | if (s->info_callback != NULL) |
| 398 | cb = s->info_callback; | 398 | cb = s->info_callback; |
| 399 | else if (s->ctx->info_callback != NULL) | 399 | else if (s->ctx->internal->info_callback != NULL) |
| 400 | cb = s->ctx->info_callback; | 400 | cb = s->ctx->internal->info_callback; |
| 401 | 401 | ||
| 402 | i = p[5]; | 402 | i = p[5]; |
| 403 | if (cb != NULL) { | 403 | if (cb != NULL) { |
