f44903a428
gcc's -Wextra pulls in -Wold-style-declaration, which triggers when a declaration has a storage-class specifier as a non-initial qualifier. The ISO C formal grammar requires the storage-class to be the first component of the declaration, if present. Seeint as the register storage-class specifier does not really have any effect anymore with modern compilers, remove it entirely while we're here, instead of fixing up the order. Interestingly, the gcc devteam warnings do not pull in -Wextra, though the clang ones do. [extended tests] Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3239)
380 lines
15 KiB
C
380 lines
15 KiB
C
/*
|
|
* Copyright 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 <string.h>
|
|
#include <openssl/buffer.h>
|
|
|
|
#ifdef __VMS
|
|
# pragma names save
|
|
# pragma names as_is,shortened
|
|
#endif
|
|
|
|
#include "../ssl/packet_locl.h"
|
|
|
|
#ifdef __VMS
|
|
# pragma names restore
|
|
#endif
|
|
|
|
#include "testutil.h"
|
|
|
|
static const unsigned char simple1[] = { 0xff };
|
|
static const unsigned char simple2[] = { 0x01, 0xff };
|
|
static const unsigned char simple3[] = { 0x00, 0x00, 0x00, 0x01, 0xff };
|
|
static const unsigned char nestedsub[] = { 0x03, 0xff, 0x01, 0xff };
|
|
static const unsigned char seqsub[] = { 0x01, 0xff, 0x01, 0xff };
|
|
static const unsigned char empty[] = { 0x00 };
|
|
static const unsigned char alloc[] = { 0x02, 0xfe, 0xff };
|
|
static const unsigned char submem[] = { 0x03, 0x02, 0xfe, 0xff };
|
|
static const unsigned char fixed[] = { 0xff, 0xff, 0xff };
|
|
|
|
static BUF_MEM *buf;
|
|
|
|
static int cleanup(WPACKET *pkt)
|
|
{
|
|
WPACKET_cleanup(pkt);
|
|
return 0;
|
|
}
|
|
|
|
static int test_WPACKET_init(void)
|
|
{
|
|
WPACKET pkt;
|
|
int i;
|
|
size_t written;
|
|
unsigned char sbuf[3];
|
|
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
/* Closing a top level WPACKET should fail */
|
|
|| !TEST_false(WPACKET_close(&pkt))
|
|
/* Finishing a top level WPACKET should succeed */
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
/*
|
|
* Can't call close or finish on a WPACKET that's already
|
|
* finished.
|
|
*/
|
|
|| !TEST_false(WPACKET_close(&pkt))
|
|
|| !TEST_false(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Now try with a one byte length prefix */
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
|
|
return cleanup(&pkt);
|
|
|
|
/* And a longer length prefix */
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 4))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple3, sizeof(simple3)))
|
|
return cleanup(&pkt);
|
|
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1)))
|
|
return cleanup(&pkt);
|
|
for (i = 1; i < 257; i++) {
|
|
/*
|
|
* Putting more bytes in than fit for the size of the length prefix
|
|
* should fail
|
|
*/
|
|
if (!TEST_int_eq(WPACKET_put_bytes_u8(&pkt, 0xff), i < 256))
|
|
return cleanup(&pkt);
|
|
}
|
|
if (!TEST_true(WPACKET_finish(&pkt)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Test initialising from a fixed size buffer */
|
|
if (!TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 0))
|
|
/* Adding 3 bytes should succeed */
|
|
|| !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xffffff))
|
|
/* Adding 1 more byte should fail */
|
|
|| !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
/* Finishing the top level WPACKET should succeed */
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(sbuf, written, fixed, sizeof(sbuf))
|
|
/* Initialise with 1 len byte */
|
|
|| !TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 1))
|
|
/* Adding 2 bytes should succeed */
|
|
|| !TEST_true(WPACKET_put_bytes_u16(&pkt, 0xfeff))
|
|
/* Adding 1 more byte should fail */
|
|
|| !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(sbuf, written, alloc, sizeof(alloc)))
|
|
return cleanup(&pkt);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int test_WPACKET_set_max_size(void)
|
|
{
|
|
WPACKET pkt;
|
|
size_t written;
|
|
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
/*
|
|
* No previous lenbytes set so we should be ok to set the max
|
|
* possible max size
|
|
*/
|
|
|| !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
|
|
/* We should be able to set it smaller too */
|
|
|| !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX -1))
|
|
/* And setting it bigger again should be ok */
|
|
|| !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
|
|
|| !TEST_true(WPACKET_finish(&pkt)))
|
|
return cleanup(&pkt);
|
|
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
/*
|
|
* Should fail because we already consumed 1 byte with the
|
|
* length
|
|
*/
|
|
|| !TEST_false(WPACKET_set_max_size(&pkt, 0))
|
|
/*
|
|
* Max size can't be bigger than biggest that will fit in
|
|
* lenbytes
|
|
*/
|
|
|| !TEST_false(WPACKET_set_max_size(&pkt, 0x0101))
|
|
/* It can be the same as the maximum possible size */
|
|
|| !TEST_true(WPACKET_set_max_size(&pkt, 0x0100))
|
|
/* Or it can be less */
|
|
|| !TEST_true(WPACKET_set_max_size(&pkt, 0x01))
|
|
/* Should fail because packet is already filled */
|
|
|| !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
/* You can't put in more bytes than max size */
|
|
|| !TEST_true(WPACKET_set_max_size(&pkt, 0x02))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
|
|
return cleanup(&pkt);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int test_WPACKET_start_sub_packet(void)
|
|
{
|
|
WPACKET pkt;
|
|
size_t written;
|
|
size_t len;
|
|
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
/* Can't finish because we have a sub packet */
|
|
|| !TEST_false(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
/* Sub packet is closed so can't close again */
|
|
|| !TEST_false(WPACKET_close(&pkt))
|
|
/* Now a top level so finish should succeed */
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Single sub-packet with length prefix */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Nested sub-packets with length prefixes */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_get_length(&pkt, &len))
|
|
|| !TEST_size_t_eq(len, 1)
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_get_length(&pkt, &len))
|
|
|| !TEST_size_t_eq(len, 3)
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, nestedsub, sizeof(nestedsub)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Sequential sub-packets with length prefixes */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, seqsub, sizeof(seqsub)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Nested sub-packets with lengths filled before finish */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_get_length(&pkt, &len))
|
|
|| !TEST_size_t_eq(len, 1)
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_get_length(&pkt, &len))
|
|
|| !TEST_size_t_eq(len, 3)
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_fill_lengths(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, nestedsub, sizeof(nestedsub))
|
|
|| !TEST_true(WPACKET_finish(&pkt)))
|
|
return cleanup(&pkt);
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int test_WPACKET_set_flags(void)
|
|
{
|
|
WPACKET pkt;
|
|
size_t written;
|
|
|
|
/* Set packet to be non-zero length */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH))
|
|
/* Should fail because of zero length */
|
|
|| !TEST_false(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Repeat above test in a sub-packet */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet(&pkt))
|
|
|| !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH))
|
|
/* Should fail because of zero length */
|
|
|| !TEST_false(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Set packet to abandon non-zero length */
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_size_t_eq(written, 0))
|
|
return cleanup(&pkt);
|
|
|
|
/* Repeat above test but only abandon a sub-packet */
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, empty, sizeof(empty)))
|
|
return cleanup(&pkt);
|
|
|
|
/* And repeat with a non empty sub-packet */
|
|
if (!TEST_true(WPACKET_init(&pkt, buf))
|
|
|| !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
|
|
|| !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
|
|
|| !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
|
|
|| !TEST_true(WPACKET_close(&pkt))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
|
|
return cleanup(&pkt);
|
|
return 1;
|
|
}
|
|
|
|
static int test_WPACKET_allocate_bytes(void)
|
|
{
|
|
WPACKET pkt;
|
|
size_t written;
|
|
unsigned char *bytes;
|
|
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_allocate_bytes(&pkt, 2, &bytes)))
|
|
return cleanup(&pkt);
|
|
bytes[0] = 0xfe;
|
|
bytes[1] = 0xff;
|
|
if (!TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, alloc, sizeof(alloc)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Repeat with WPACKET_sub_allocate_bytes */
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_sub_allocate_bytes_u8(&pkt, 2, &bytes)))
|
|
return cleanup(&pkt);
|
|
bytes[0] = 0xfe;
|
|
bytes[1] = 0xff;
|
|
if (!TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, submem, sizeof(submem)))
|
|
return cleanup(&pkt);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int test_WPACKET_memcpy(void)
|
|
{
|
|
WPACKET pkt;
|
|
size_t written;
|
|
const unsigned char bytes[] = { 0xfe, 0xff };
|
|
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_memcpy(&pkt, bytes, sizeof(bytes)))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, alloc, sizeof(alloc)))
|
|
return cleanup(&pkt);
|
|
|
|
/* Repeat with WPACKET_sub_memcpy() */
|
|
if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
|
|
|| !TEST_true(WPACKET_sub_memcpy_u8(&pkt, bytes, sizeof(bytes)))
|
|
|| !TEST_true(WPACKET_finish(&pkt))
|
|
|| !TEST_true(WPACKET_get_total_written(&pkt, &written))
|
|
|| !TEST_mem_eq(buf->data, written, submem, sizeof(submem)))
|
|
return cleanup(&pkt);
|
|
|
|
return 1;
|
|
}
|
|
|
|
int test_main(int argc, char *argv[])
|
|
{
|
|
int testresult = 0;
|
|
|
|
if (!TEST_ptr(buf = BUF_MEM_new()))
|
|
return 0;
|
|
|
|
ADD_TEST(test_WPACKET_init);
|
|
ADD_TEST(test_WPACKET_set_max_size);
|
|
ADD_TEST(test_WPACKET_start_sub_packet);
|
|
ADD_TEST(test_WPACKET_set_flags);
|
|
ADD_TEST(test_WPACKET_allocate_bytes);
|
|
ADD_TEST(test_WPACKET_memcpy);
|
|
testresult = run_tests(argv[0]);
|
|
|
|
BUF_MEM_free(buf);
|
|
return testresult;
|
|
}
|