From 0ed9ca21ae788097b030d1454152644d34131c76 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 26 Jan 2015 16:46:49 +0000 Subject: [PATCH] Remove explicit setting of read_ahead for DTLS. It never makes sense not to use read_ahead with DTLS because it doesn't work. Therefore read_ahead needs to be the default. Reviewed-by: Andy Polyakov (cherry picked from commit f4002412518703d07fee321d4c88ee0bbe1694fe) --- apps/s_client.c | 6 ------ apps/s_server.c | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index b1152aa362..8212c9fe4a 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1295,12 +1295,6 @@ int MAIN(int argc, char **argv) #endif if (exc) ssl_ctx_set_excert(ctx, exc); - /* - * DTLS: partial reads end up discarding unread UDP bytes :-( Setting - * read ahead solves this problem. - */ - if (socket_type == SOCK_DGRAM) - SSL_CTX_set_read_ahead(ctx, 1); #if !defined(OPENSSL_NO_TLSEXT) # if !defined(OPENSSL_NO_NEXTPROTONEG) diff --git a/apps/s_server.c b/apps/s_server.c index baa2455e07..5709546ebf 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1736,12 +1736,6 @@ int MAIN(int argc, char *argv[]) SSL_CTX_set_options(ctx, SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); if (exc) ssl_ctx_set_excert(ctx, exc); - /* - * DTLS: partial reads end up discarding unread UDP bytes :-( Setting - * read ahead solves this problem. - */ - if (socket_type == SOCK_DGRAM) - SSL_CTX_set_read_ahead(ctx, 1); if (state) SSL_CTX_set_info_callback(ctx, apps_ssl_info_callback); @@ -1821,12 +1815,6 @@ int MAIN(int argc, char *argv[]) SSL_CTX_set_options(ctx2, SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); if (exc) ssl_ctx_set_excert(ctx2, exc); - /* - * DTLS: partial reads end up discarding unread UDP bytes :-( - * Setting read ahead solves this problem. - */ - if (socket_type == SOCK_DGRAM) - SSL_CTX_set_read_ahead(ctx2, 1); if (state) SSL_CTX_set_info_callback(ctx2, apps_ssl_info_callback); -- 2.25.1