diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2021-03-17 18:11:02 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2021-03-17 18:11:02 +0000 |
| commit | 5090f31606aecb50596fd89bfd5da13741f810af (patch) | |
| tree | 428ad97e05940a1eec821f26b4dc361e272a12d0 /usr.bin/openssl | |
| parent | f2c78c4abcc5cd49558d2cc436cfafba51a9888a (diff) | |
Read ahead is now enforced for DTLS - remove workarounds.
ok inoguchi@ tb@
Diffstat (limited to 'usr.bin/openssl')
| -rw-r--r-- | usr.bin/openssl/s_client.c | 8 | ||||
| -rw-r--r-- | usr.bin/openssl/s_server.c | 14 |
2 files changed, 2 insertions, 20 deletions
diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c index f03f8a9505e..df35ffbc654 100644 --- a/usr.bin/openssl/s_client.c +++ b/usr.bin/openssl/s_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_client.c,v 1.53 2021/03/17 18:08:32 jsing Exp $ */ +/* $OpenBSD: s_client.c,v 1.54 2021/03/17 18:11:01 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1025,12 +1025,6 @@ s_client_main(int argc, char **argv) if (s_client_config.clr) SSL_CTX_clear_options(ctx, s_client_config.clr); - /* - * DTLS: partial reads end up discarding unread UDP bytes :-( Setting - * read ahead solves this problem. - */ - if (s_client_config.socket_type == SOCK_DGRAM) - SSL_CTX_set_read_ahead(ctx, 1); if (s_client_config.alpn_in) { unsigned short alpn_len; diff --git a/usr.bin/openssl/s_server.c b/usr.bin/openssl/s_server.c index 16732954f1f..1bd544324a8 100644 --- a/usr.bin/openssl/s_server.c +++ b/usr.bin/openssl/s_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_server.c,v 1.46 2021/03/17 18:09:50 jsing Exp $ */ +/* $OpenBSD: s_server.c,v 1.47 2021/03/17 18:11:01 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1239,12 +1239,6 @@ s_server_main(int argc, char *argv[]) if (s_server_config.bugs) SSL_CTX_set_options(ctx, SSL_OP_ALL); SSL_CTX_set_options(ctx, s_server_config.off); - /* - * DTLS: partial reads end up discarding unread UDP bytes :-( Setting - * read ahead solves this problem. - */ - if (s_server_config.socket_type == SOCK_DGRAM) - SSL_CTX_set_read_ahead(ctx, 1); if (s_server_config.state) SSL_CTX_set_info_callback(ctx, apps_ssl_info_callback); @@ -1307,12 +1301,6 @@ s_server_main(int argc, char *argv[]) if (s_server_config.bugs) SSL_CTX_set_options(ctx2, SSL_OP_ALL); SSL_CTX_set_options(ctx2, s_server_config.off); - /* - * DTLS: partial reads end up discarding unread UDP bytes :-( - * Setting read ahead solves this problem. - */ - if (s_server_config.socket_type == SOCK_DGRAM) - SSL_CTX_set_read_ahead(ctx2, 1); if (s_server_config.state) SSL_CTX_set_info_callback(ctx2, apps_ssl_info_callback); |