/*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
#include "../ssl/packet_locl.h"
#include "testutil.h"
-#include "test_main_custom.h"
#define CLIENT_VERSION_LEN 2
*/
#define TEST_ADD_PADDING_AND_PSK 3
-#define F5_WORKAROUND_MIN_MSG_LEN 0xff
+#define F5_WORKAROUND_MIN_MSG_LEN 0x7f
#define F5_WORKAROUND_MAX_MSG_LEN 0x200
static const char *sessionfile = NULL;
/* Dummy ALPN protocols used to pad out the size of the ClientHello */
static const char alpn_prots[] =
"0123456789012345678901234567890123456789012345678901234567890123456789"
- "0123456789012345678901234567890123456789012345678901234567890123456789";
+ "0123456789012345678901234567890123456789012345678901234567890123456789"
+ "01234567890123456789";
static int test_client_hello(int currtest)
{
BIO *wbio;
long len;
unsigned char *data;
- PACKET pkt, pkt2, pkt3;
+ PACKET pkt = {0}, pkt2 = {0}, pkt3 = {0};
char *dummytick = "Hello World!";
unsigned int type = 0;
int testresult = 0;
case TEST_ADD_PADDING:
case TEST_PADDING_NOT_NEEDED:
SSL_CTX_set_options(ctx, SSL_OP_TLSEXT_PADDING);
+ /* Make sure we get a consistent size across TLS versions */
+ SSL_CTX_clear_options(ctx, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
/*
- * 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,
- (unsigned char *)alpn_prots,
- sizeof(alpn_prots) - 1))))
+ && (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
+ (unsigned char *)alpn_prots,
+ sizeof(alpn_prots) - 1))))
goto end;
break;
* We reset the creation time so that we don't discard the session as
* too old.
*/
- if (!TEST_true(SSL_SESSION_set_time(sess, time(NULL)))
+ if (!TEST_true(SSL_SESSION_set_time(sess, (long)time(NULL)))
|| !TEST_true(SSL_set_session(con, sess)))
goto end;
}
return testresult;
}
-int test_main(int argc, char *argv[])
+int setup_tests(void)
{
- if (argc != 2)
- return EXIT_FAILURE;
-
- sessionfile = argv[1];
+ if (!TEST_ptr(sessionfile = test_get_argument(0)))
+ return 0;
ADD_ALL_TESTS(test_client_hello, TOTAL_NUM_TESTS);
-
- return run_tests(argv[0]);
+ return 1;
}