X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fclienthellotest.c;h=61e81c3833a1a0f2e59164e568786a051b3b479f;hp=9cb563c548541a94e5637d3a8b71491335ce0ec9;hb=6530c4909ffbf4fd655416cbd765b1e7174b9b83;hpb=c2e27310c790c0dd2f87dd420e65e0cca522ddb2 diff --git a/test/clienthellotest.c b/test/clienthellotest.c index 9cb563c548..61e81c3833 100644 --- a/test/clienthellotest.c +++ b/test/clienthellotest.c @@ -1,89 +1,33 @@ -/* Written by Matt Caswell for the OpenSSL Project */ -/* ==================================================================== - * Copyright (c) 1998-2015 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). +/* + * Copyright 2015-2016 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 + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html */ #include +#include #include #include #include #include #include +#include "../ssl/packet_locl.h" #define CLIENT_VERSION_LEN 2 -#define SESSION_ID_LEN_LEN 1 -#define CIPHERS_LEN_LEN 2 -#define COMPRESSION_LEN_LEN 1 -#define EXTENSIONS_LEN_LEN 2 -#define EXTENSION_TYPE_LEN 2 -#define EXTENSION_SIZE_LEN 2 - -#define TOTAL_NUM_TESTS 2 -/* - * Test that explicitly setting ticket data results in it appearing in the - * ClientHello for TLS1.2 - */ -#define TEST_SET_SESSION_TICK_DATA_TLS_1_2 0 +#define TOTAL_NUM_TESTS 1 /* * Test that explicitly setting ticket data results in it appearing in the * ClientHello for a negotiated SSL/TLS version */ -#define TEST_SET_SESSION_TICK_DATA_VER_NEG 1 +#define TEST_SET_SESSION_TICK_DATA_VER_NEG 0 int main(int argc, char *argv[]) { @@ -94,17 +38,12 @@ int main(int argc, char *argv[]) BIO *err; long len; unsigned char *data; - unsigned char *dataend; + PACKET pkt, pkt2, pkt3; char *dummytick = "Hello World!"; - unsigned int tmplen; unsigned int type; - unsigned int size; int testresult = 0; int currtest = 0; - SSL_library_init(); - SSL_load_error_strings(); - err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT); CRYPTO_set_mem_debug(1); @@ -116,20 +55,28 @@ int main(int argc, char *argv[]) */ for (; currtest < TOTAL_NUM_TESTS; currtest++) { testresult = 0; - if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2) { - ctx = SSL_CTX_new(TLSv1_2_method()); - } else { - ctx = SSL_CTX_new(TLS_method()); - } + ctx = SSL_CTX_new(TLS_method()); + + /* Testing for session tickets <= TLS1.2; not relevant for 1.3 */ + if (ctx == NULL || !SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION)) + goto end; + con = SSL_new(ctx); + if (con == NULL) + goto end; rbio = BIO_new(BIO_s_mem()); wbio = BIO_new(BIO_s_mem()); + if (rbio == NULL || wbio == NULL) { + BIO_free(rbio); + BIO_free(wbio); + goto end; + } + SSL_set_bio(con, rbio, wbio); SSL_set_connect_state(con); - if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2 - || currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) { + if (currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) { if (!SSL_set_session_ticket_ext(con, dummytick, strlen(dummytick))) goto end; } @@ -140,51 +87,47 @@ int main(int argc, char *argv[]) } len = BIO_get_mem_data(wbio, (char **)&data); - dataend = data + len; + if (!PACKET_buf_init(&pkt, data, len)) + goto end; /* Skip the record header */ - data += SSL3_RT_HEADER_LENGTH; + if (!PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH)) + goto end; + /* Skip the handshake message header */ - data += SSL3_HM_HEADER_LENGTH; + if (!PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH)) + goto end; + /* Skip client version and random */ - data += CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE; - if (data + SESSION_ID_LEN_LEN > dataend) + if (!PACKET_forward(&pkt, CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE)) goto end; + /* Skip session id */ - tmplen = *data; - data += SESSION_ID_LEN_LEN + tmplen; - if (data + CIPHERS_LEN_LEN > dataend) + if (!PACKET_get_length_prefixed_1(&pkt, &pkt2)) goto end; + /* Skip ciphers */ - tmplen = ((*data) << 8) | *(data + 1); - data += CIPHERS_LEN_LEN + tmplen; - if (data + COMPRESSION_LEN_LEN > dataend) + if (!PACKET_get_length_prefixed_2(&pkt, &pkt2)) goto end; + /* Skip compression */ - tmplen = *data; - data += COMPRESSION_LEN_LEN + tmplen; - if (data + EXTENSIONS_LEN_LEN > dataend) + if (!PACKET_get_length_prefixed_1(&pkt, &pkt2)) goto end; + /* Extensions len */ - tmplen = ((*data) << 8) | *(data + 1); - data += EXTENSIONS_LEN_LEN; - if (data + tmplen > dataend) + if (!PACKET_as_length_prefixed_2(&pkt, &pkt2)) goto end; /* Loop through all extensions */ - while (tmplen > EXTENSION_TYPE_LEN + EXTENSION_SIZE_LEN) { - type = ((*data) << 8) | *(data + 1); - data += EXTENSION_TYPE_LEN; - size = ((*data) << 8) | *(data + 1); - data += EXTENSION_SIZE_LEN; - if (data + size > dataend) + while (PACKET_remaining(&pkt2)) { + + if (!PACKET_get_net_2(&pkt2, &type) || + !PACKET_get_length_prefixed_2(&pkt2, &pkt3)) goto end; if (type == TLSEXT_TYPE_session_ticket) { - if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2 - || currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) { - if (size == strlen(dummytick) - && memcmp(data, dummytick, size) == 0) { + if (currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) { + if (PACKET_equal(&pkt3, dummytick, strlen(dummytick))) { /* Ticket data is as we expected */ testresult = 1; } else { @@ -194,8 +137,6 @@ int main(int argc, char *argv[]) } } - tmplen -= EXTENSION_TYPE_LEN + EXTENSION_SIZE_LEN + size; - data += size; } end: @@ -207,12 +148,9 @@ int main(int argc, char *argv[]) } } - ERR_free_strings(); - ERR_remove_thread_state(NULL); - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); #ifndef OPENSSL_NO_CRYPTO_MDEBUG - CRYPTO_mem_leaks(err); + if (CRYPTO_mem_leaks(err) <= 0) + testresult = 0; #endif BIO_free(err);