diff options
author | beck <> | 2017-01-23 04:55:27 +0000 |
---|---|---|
committer | beck <> | 2017-01-23 04:55:27 +0000 |
commit | c35f51566045be89c49b0a47e153fdb27ec20f8e (patch) | |
tree | 7b3e30aaa4ce396a0dcc28cc981628a669ff50d2 /src/lib/libssl/s23_lib.c | |
parent | 0f157a9ac8d269cb234cff4f5cd07800027490ff (diff) | |
download | openbsd-c35f51566045be89c49b0a47e153fdb27ec20f8e.tar.gz openbsd-c35f51566045be89c49b0a47e153fdb27ec20f8e.tar.bz2 openbsd-c35f51566045be89c49b0a47e153fdb27ec20f8e.zip |
move the callbacks from ssl_st to internal
ok jsing@
Diffstat (limited to 'src/lib/libssl/s23_lib.c')
-rw-r--r-- | src/lib/libssl/s23_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index cd594aa3c9..5de30c69e6 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s23_lib.c,v 1.18 2014/11/16 14:12:47 jsing Exp $ */ | 1 | /* $OpenBSD: s23_lib.c,v 1.19 2017/01/23 04:55:26 beck 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 | * |
@@ -74,8 +74,8 @@ ssl23_read(SSL *s, void *buf, int len) | |||
74 | int n; | 74 | int n; |
75 | 75 | ||
76 | errno = 0; | 76 | errno = 0; |
77 | if (SSL_in_init(s) && (!s->in_handshake)) { | 77 | if (SSL_in_init(s) && (!s->internal->in_handshake)) { |
78 | n = s->handshake_func(s); | 78 | n = s->internal->handshake_func(s); |
79 | if (n < 0) | 79 | if (n < 0) |
80 | return (n); | 80 | return (n); |
81 | if (n == 0) { | 81 | if (n == 0) { |
@@ -95,8 +95,8 @@ ssl23_peek(SSL *s, void *buf, int len) | |||
95 | int n; | 95 | int n; |
96 | 96 | ||
97 | errno = 0; | 97 | errno = 0; |
98 | if (SSL_in_init(s) && (!s->in_handshake)) { | 98 | if (SSL_in_init(s) && (!s->internal->in_handshake)) { |
99 | n = s->handshake_func(s); | 99 | n = s->internal->handshake_func(s); |
100 | if (n < 0) | 100 | if (n < 0) |
101 | return (n); | 101 | return (n); |
102 | if (n == 0) { | 102 | if (n == 0) { |
@@ -116,8 +116,8 @@ ssl23_write(SSL *s, const void *buf, int len) | |||
116 | int n; | 116 | int n; |
117 | 117 | ||
118 | errno = 0; | 118 | errno = 0; |
119 | if (SSL_in_init(s) && (!s->in_handshake)) { | 119 | if (SSL_in_init(s) && (!s->internal->in_handshake)) { |
120 | n = s->handshake_func(s); | 120 | n = s->internal->handshake_func(s); |
121 | if (n < 0) | 121 | if (n < 0) |
122 | return (n); | 122 | return (n); |
123 | if (n == 0) { | 123 | if (n == 0) { |