Commit 1d2491e2 authored by Matt Caswell's avatar Matt Caswell
Browse files

Don't use ciphersuites for inflating the ClientHello in clienthellotest 



clienthellotest tries to fill out the size of the ClientHello by adding
extra ciphersuites in order to test the padding extension. This is
unreliable because they are very dependent on configuration options. If we
add too much data the test will fail! We were already also adding some dummy
ALPN protocols to pad out the size, and it turns out that this is sufficient
just in itself, so drop the extra ciphersuites.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4331)
parent 3d85c7f4

test/clienthellotest.c

+5 −7
Original line number Diff line number Diff line
@@ -90,14 +90,12 @@ static int test_client_hello(int currtest) 
    case TEST_PADDING_NOT_NEEDED:

        SSL_CTX_set_options(ctx, SSL_OP_TLSEXT_PADDING);

        /*

         * Add lots of ciphersuites so that the ClientHello is at least

         * Add some dummy ALPN protocols so that the ClientHello is at least

         * F5_WORKAROUND_MIN_MSG_LEN bytes long - meaning padding will be

         * needed. Also add some dummy ALPN protocols in case we still don't

         * have enough.

         * needed.

         */

        if (currtest == TEST_ADD_PADDING

                && (!TEST_true(SSL_CTX_set_cipher_list(ctx, "ALL"))

                    || !TEST_false(SSL_CTX_set_alpn_protos(ctx,

                && (!TEST_false(SSL_CTX_set_alpn_protos(ctx,

                                    (unsigned char *)alpn_prots,

                                    sizeof(alpn_prots) - 1))))

            goto end;