diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/s_client.c | 8 | ||||
| -rw-r--r-- | src/usr.bin/openssl/s_server.c | 14 |
2 files changed, 2 insertions, 20 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; |
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c index 16732954f1..1bd544324a 100644 --- a/src/usr.bin/openssl/s_server.c +++ b/src/usr.bin/openssl/s_server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_server.c,v 1.46 2021/03/17 18:09:50 jsing Exp $ */ | 1 | /* $OpenBSD: s_server.c,v 1.47 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 | * |
| @@ -1239,12 +1239,6 @@ s_server_main(int argc, char *argv[]) | |||
| 1239 | if (s_server_config.bugs) | 1239 | if (s_server_config.bugs) |
| 1240 | SSL_CTX_set_options(ctx, SSL_OP_ALL); | 1240 | SSL_CTX_set_options(ctx, SSL_OP_ALL); |
| 1241 | SSL_CTX_set_options(ctx, s_server_config.off); | 1241 | SSL_CTX_set_options(ctx, s_server_config.off); |
| 1242 | /* | ||
| 1243 | * DTLS: partial reads end up discarding unread UDP bytes :-( Setting | ||
| 1244 | * read ahead solves this problem. | ||
| 1245 | */ | ||
| 1246 | if (s_server_config.socket_type == SOCK_DGRAM) | ||
| 1247 | SSL_CTX_set_read_ahead(ctx, 1); | ||
| 1248 | 1242 | ||
| 1249 | if (s_server_config.state) | 1243 | if (s_server_config.state) |
| 1250 | SSL_CTX_set_info_callback(ctx, apps_ssl_info_callback); | 1244 | SSL_CTX_set_info_callback(ctx, apps_ssl_info_callback); |
| @@ -1307,12 +1301,6 @@ s_server_main(int argc, char *argv[]) | |||
| 1307 | if (s_server_config.bugs) | 1301 | if (s_server_config.bugs) |
| 1308 | SSL_CTX_set_options(ctx2, SSL_OP_ALL); | 1302 | SSL_CTX_set_options(ctx2, SSL_OP_ALL); |
| 1309 | SSL_CTX_set_options(ctx2, s_server_config.off); | 1303 | SSL_CTX_set_options(ctx2, s_server_config.off); |
| 1310 | /* | ||
| 1311 | * DTLS: partial reads end up discarding unread UDP bytes :-( | ||
| 1312 | * Setting read ahead solves this problem. | ||
| 1313 | */ | ||
| 1314 | if (s_server_config.socket_type == SOCK_DGRAM) | ||
| 1315 | SSL_CTX_set_read_ahead(ctx2, 1); | ||
| 1316 | 1304 | ||
| 1317 | if (s_server_config.state) | 1305 | if (s_server_config.state) |
| 1318 | SSL_CTX_set_info_callback(ctx2, apps_ssl_info_callback); | 1306 | SSL_CTX_set_info_callback(ctx2, apps_ssl_info_callback); |
