/*
- * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <openssl/err.h>
#include <time.h>
-#include "../ssl/packet_locl.h"
+#include "internal/packet.h"
#include "testutil.h"
BIO *wbio;
long len;
unsigned char *data;
- PACKET pkt = {0}, pkt2 = {0}, pkt3 = {0};
+ PACKET pkt, pkt2, pkt3;
char *dummytick = "Hello World!";
unsigned int type = 0;
int testresult = 0;
return 1;
#endif
+ memset(&pkt, 0, sizeof(pkt));
+ memset(&pkt2, 0, sizeof(pkt2));
+ memset(&pkt3, 0, sizeof(pkt3));
+
/*
* For each test set up an SSL_CTX and SSL and see what ClientHello gets
* produced when we try to connect
ctx = SSL_CTX_new(TLS_method());
if (!TEST_ptr(ctx))
goto end;
+ if (!TEST_true(SSL_CTX_set_max_proto_version(ctx, 0)))
+ goto end;
switch(currtest) {
case TEST_SET_SESSION_TICK_DATA_VER_NEG:
+#if !defined(OPENSSL_NO_TLS1_3) && defined(OPENSSL_NO_TLS1_2)
+ /* TLSv1.3 is enabled and TLSv1.2 is disabled so can't do this test */
+ SSL_CTX_free(ctx);
+ return 1;
+#else
/* Testing for session tickets <= TLS1.2; not relevant for 1.3 */
if (!TEST_true(SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION)))
goto end;
+#endif
break;
case TEST_ADD_PADDING_AND_PSK:
+ /*
+ * In this case we're doing TLSv1.3 and we're sending a PSK so the
+ * ClientHello is already going to be quite long. To avoid getting one
+ * that is too long for this test we use a restricted ciphersuite list
+ */
+ if (!TEST_false(SSL_CTX_set_cipher_list(ctx, "")))
+ goto end;
+ ERR_clear_error();
+ /* Fall through */
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 some dummy ALPN protocols so that the ClientHello is at least
* F5_WORKAROUND_MIN_MSG_LEN bytes long - meaning padding will be
* needed.
*/
- if (currtest == TEST_ADD_PADDING
- && (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
+ if (currtest == TEST_ADD_PADDING) {
+ if (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
(unsigned char *)alpn_prots,
- sizeof(alpn_prots) - 1))))
+ sizeof(alpn_prots) - 1)))
+ goto end;
+ /*
+ * Otherwise we need to make sure we have a small enough message to
+ * not need padding.
+ */
+ } else if (!TEST_true(SSL_CTX_set_cipher_list(ctx,
+ "AES128-SHA"))
+ || !TEST_true(SSL_CTX_set_ciphersuites(ctx,
+ "TLS_AES_128_GCM_SHA256"))) {
goto end;
-
+ }
break;
default:
return testresult;
}
+OPT_TEST_DECLARE_USAGE("sessionfile\n")
+
int setup_tests(void)
{
+ if (!test_skip_common_options()) {
+ TEST_error("Error parsing test options\n");
+ return 0;
+ }
+
if (!TEST_ptr(sessionfile = test_get_argument(0)))
return 0;