diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-26 16:46:49 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-27 14:30:25 +0000 |
| commit | 0ed9ca21ae788097b030d1454152644d34131c76 (patch) | |
| tree | e6562635f35568fc1519e77c778f15e3dbfa8c6b /apps | |
| parent | 11b32d6e29b87eaf8d14f218ff2a739af2237555 (diff) | |
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 <appro@openssl.org>
(cherry picked from commit f4002412518703d07fee321d4c88ee0bbe1694fe)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 6 | ||||
| -rw-r--r-- | apps/s_server.c | 12 |
2 files changed, 0 insertions, 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); |