Commit 131d3fdf authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
(cherry picked from commit f4002412)

Conflicts:
	apps/s_client.c
	apps/s_server.c
parent 18955838

apps/s_client.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

apps/s_server.c

+0 −12
Original line number Diff line number Diff line
@@ -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);