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:35:11 +0000 |
| commit | 131d3fdfe2deae6c7ff180c561c088e3e11dd659 (patch) | |
| tree | 7851928079c1176fbe62ac47e63ee4eefa0dce31 | |
| parent | 1895583835239bc44c3f6584e48f0279ad884f3b (diff) | |
| download | openssl-new-131d3fdfe2deae6c7ff180c561c088e3e11dd659.tar.gz | |
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)
Conflicts:
apps/s_client.c
apps/s_server.c
| -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 0bbc065248..758fb2563e 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1149,12 +1149,6 @@ int MAIN(int argc, char **argv) if (clr) SSL_CTX_clear_options(ctx, clr); - /* - * 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) && !defined(OPENSSL_NO_NEXTPROTONEG) if (next_proto.data) diff --git a/apps/s_server.c b/apps/s_server.c index 0cac749fd4..70ee5c341f 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1541,12 +1541,6 @@ int MAIN(int argc, char *argv[]) if (hack) SSL_CTX_set_options(ctx, SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); SSL_CTX_set_options(ctx, off); - /* - * 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); @@ -1614,12 +1608,6 @@ int MAIN(int argc, char *argv[]) if (hack) SSL_CTX_set_options(ctx2, SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); SSL_CTX_set_options(ctx2, off); - /* - * 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); |