diff options
author | jsing <> | 2021-03-17 18:11:01 +0000 |
---|---|---|
committer | jsing <> | 2021-03-17 18:11:01 +0000 |
commit | 2383fe1805dd61190c182b5b57afc85ff78c3c17 (patch) | |
tree | c41388d0a567bbc69befe646c539a329bbd643dc /src/usr.bin/openssl/s_client.c | |
parent | 8aa0665375f895a74db2ba435cef21a47354b36c (diff) | |
download | openbsd-2383fe1805dd61190c182b5b57afc85ff78c3c17.tar.gz openbsd-2383fe1805dd61190c182b5b57afc85ff78c3c17.tar.bz2 openbsd-2383fe1805dd61190c182b5b57afc85ff78c3c17.zip |
Read ahead is now enforced for DTLS - remove workarounds.
ok inoguchi@ tb@
Diffstat (limited to 'src/usr.bin/openssl/s_client.c')
-rw-r--r-- | src/usr.bin/openssl/s_client.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c index f03f8a9505..df35ffbc65 100644 --- a/src/usr.bin/openssl/s_client.c +++ b/src/usr.bin/openssl/s_client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_client.c,v 1.53 2021/03/17 18:08:32 jsing Exp $ */ | 1 | /* $OpenBSD: s_client.c,v 1.54 2021/03/17 18:11:01 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 | * |
@@ -1025,12 +1025,6 @@ s_client_main(int argc, char **argv) | |||
1025 | 1025 | ||
1026 | if (s_client_config.clr) | 1026 | if (s_client_config.clr) |
1027 | SSL_CTX_clear_options(ctx, s_client_config.clr); | 1027 | SSL_CTX_clear_options(ctx, s_client_config.clr); |
1028 | /* | ||
1029 | * DTLS: partial reads end up discarding unread UDP bytes :-( Setting | ||
1030 | * read ahead solves this problem. | ||
1031 | */ | ||
1032 | if (s_client_config.socket_type == SOCK_DGRAM) | ||
1033 | SSL_CTX_set_read_ahead(ctx, 1); | ||
1034 | 1028 | ||
1035 | if (s_client_config.alpn_in) { | 1029 | if (s_client_config.alpn_in) { |
1036 | unsigned short alpn_len; | 1030 | unsigned short alpn_len; |