diff options
| author |   beck <beck@openbsd.org> | 2017-01-23 04:55:26 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-23 04:55:26 +0000 |
| commit | ff2362174b425eaa5de48bc9c2ce3dd4e81e84c5 (patch) | |
| tree | fbfc6a21044c98cf1a52af33a8eb920ba55fccb8 /lib/libssl/s23_lib.c | |
| parent | Call isatty() before tcgetattr() in the lex. This is a little redundant, (diff) | |
| download | wireguard-openbsd-ff2362174b425eaa5de48bc9c2ce3dd4e81e84c5.tar.xz wireguard-openbsd-ff2362174b425eaa5de48bc9c2ce3dd4e81e84c5.zip | |
move the callbacks from ssl_st to internal
ok jsing@
Diffstat (limited to 'lib/libssl/s23_lib.c')
| -rw-r--r-- | lib/libssl/s23_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/s23_lib.c b/lib/libssl/s23_lib.c index cd594aa3c96..5de30c69e63 100644 --- a/lib/libssl/s23_lib.c +++ b/lib/libssl/s23_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_lib.c,v 1.18 2014/11/16 14:12:47 jsing Exp $ */ +/* $OpenBSD: s23_lib.c,v 1.19 2017/01/23 04:55:26 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -74,8 +74,8 @@ ssl23_read(SSL *s, void *buf, int len) int n; errno = 0; - if (SSL_in_init(s) && (!s->in_handshake)) { - n = s->handshake_func(s); + if (SSL_in_init(s) && (!s->internal->in_handshake)) { + n = s->internal->handshake_func(s); if (n < 0) return (n); if (n == 0) { @@ -95,8 +95,8 @@ ssl23_peek(SSL *s, void *buf, int len) int n; errno = 0; - if (SSL_in_init(s) && (!s->in_handshake)) { - n = s->handshake_func(s); + if (SSL_in_init(s) && (!s->internal->in_handshake)) { + n = s->internal->handshake_func(s); if (n < 0) return (n); if (n == 0) { @@ -116,8 +116,8 @@ ssl23_write(SSL *s, const void *buf, int len) int n; errno = 0; - if (SSL_in_init(s) && (!s->in_handshake)) { - n = s->handshake_func(s); + if (SSL_in_init(s) && (!s->internal->in_handshake)) { + n = s->internal->handshake_func(s); if (n < 0) return (n); if (n == 0) { |