diff options
author | jsing <> | 2017-01-23 04:15:28 +0000 |
---|---|---|
committer | jsing <> | 2017-01-23 04:15:28 +0000 |
commit | 0f157a9ac8d269cb234cff4f5cd07800027490ff (patch) | |
tree | d2bcfe381c02ccf528bdd3f18dcabbc4bec0aa3c /src/lib/libssl/s3_pkt.c | |
parent | fdee32bae021d93d570e88a1dbbea0b3bad2c1e0 (diff) | |
download | openbsd-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/s3_pkt.c')
-rw-r--r-- | src/lib/libssl/s3_pkt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index 857d35b5a8..a1d0ef9299 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_pkt.c,v 1.61 2017/01/22 09:02:07 jsing Exp $ */ | 1 | /* $OpenBSD: s3_pkt.c,v 1.62 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 | * |
@@ -1115,8 +1115,8 @@ start: | |||
1115 | 1115 | ||
1116 | if (s->info_callback != NULL) | 1116 | if (s->info_callback != NULL) |
1117 | cb = s->info_callback; | 1117 | cb = s->info_callback; |
1118 | else if (s->ctx->info_callback != NULL) | 1118 | else if (s->ctx->internal->info_callback != NULL) |
1119 | cb = s->ctx->info_callback; | 1119 | cb = s->ctx->internal->info_callback; |
1120 | 1120 | ||
1121 | if (cb != NULL) { | 1121 | if (cb != NULL) { |
1122 | j = (alert_level << 8) | alert_descr; | 1122 | j = (alert_level << 8) | alert_descr; |
@@ -1397,8 +1397,8 @@ ssl3_dispatch_alert(SSL *s) | |||
1397 | 1397 | ||
1398 | if (s->info_callback != NULL) | 1398 | if (s->info_callback != NULL) |
1399 | cb = s->info_callback; | 1399 | cb = s->info_callback; |
1400 | else if (s->ctx->info_callback != NULL) | 1400 | else if (s->ctx->internal->info_callback != NULL) |
1401 | cb = s->ctx->info_callback; | 1401 | cb = s->ctx->internal->info_callback; |
1402 | 1402 | ||
1403 | if (cb != NULL) { | 1403 | if (cb != NULL) { |
1404 | j = (s->s3->send_alert[0]<<8)|s->s3->send_alert[1]; | 1404 | j = (s->s3->send_alert[0]<<8)|s->s3->send_alert[1]; |