diff options
| author |   jsing <jsing@openbsd.org> | 2018-04-07 17:02:34 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-04-07 17:02:34 +0000 |
| commit | 825249298c76e3ab26c9bfd070865b322b16f494 (patch) | |
| tree | 6edc61f7d76a4a668c4c32d22d2afa0743f565a6 /lib/libssl/ssl_lib.c | |
| parent | Nuke SSL3_FLAGS_DELAY_CLIENT_FINISHED and SSL3_FLAGS_POP_BUFFER. (diff) | |
| download | wireguard-openbsd-825249298c76e3ab26c9bfd070865b322b16f494.tar.xz wireguard-openbsd-825249298c76e3ab26c9bfd070865b322b16f494.zip | |
Remove function pointers for ssl_{read,write,peek}.
Now that everything goes through the same code path, we can remove a layer
of indirection and just call ssl3_{read,write,peek} directly.
ok beck@ inoguchi@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 573e63c934a..30aea263f66 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.182 2018/03/17 16:20:01 beck Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.183 2018/04/07 17:02:34 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -964,7 +964,7 @@ SSL_read(SSL *s, void *buf, int num) s->internal->rwstate = SSL_NOTHING; return (0); } - return (s->method->internal->ssl_read(s, buf, num)); + return ssl3_read(s, buf, num); } int @@ -978,7 +978,7 @@ SSL_peek(SSL *s, void *buf, int num) if (s->internal->shutdown & SSL_RECEIVED_SHUTDOWN) { return (0); } - return (s->method->internal->ssl_peek(s, buf, num)); + return ssl3_peek(s, buf, num); } int @@ -994,7 +994,7 @@ SSL_write(SSL *s, const void *buf, int num) SSLerror(s, SSL_R_PROTOCOL_IS_SHUTDOWN); return (-1); } - return (s->method->internal->ssl_write(s, buf, num)); + return ssl3_write(s, buf, num); } int |