#include <openssl/buffer.h>
#include "../ssl/packet_locl.h"
#include "testutil.h"
+#include "test_main_custom.h"
const static unsigned char simple1 = 0xff;
const static unsigned char simple2[] = { 0x01, 0xff };
const static unsigned char empty = 0x00;
const static unsigned char alloc[] = { 0x02, 0xfe, 0xff };
const static unsigned char submem[] = { 0x03, 0x02, 0xfe, 0xff };
+const static unsigned char fixed[] = { 0xff, 0xff, 0xff };
static BUF_MEM *buf;
WPACKET pkt;
int i;
size_t written;
+ unsigned char sbuf[3];
if (!WPACKET_init(&pkt, buf)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
/* Closing a top level WPACKET should fail */
|| WPACKET_close(&pkt)
/* Finishing a top level WPACKET should succeed */
/* Now try with a one byte length prefix */
if (!WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(simple2)
/* And a longer length prefix */
if (!WPACKET_init_len(&pkt, buf, 4)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(simple3)
* Putting more bytes in than fit for the size of the length prefix
* should fail
*/
- if ((!WPACKET_put_bytes(&pkt, 0xff, 1)) == (i != 256)) {
+ if ((!WPACKET_put_bytes_u8(&pkt, 0xff)) == (i != 256)) {
testfail("test_WPACKET_init():4 failed\n", &pkt);
return 0;
}
return 0;
}
+ /* Test initialising from a fixed size buffer */
+ if (!WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 0)
+ /* Adding 3 bytes should succeed */
+ || !WPACKET_put_bytes_u24(&pkt, 0xffffff)
+ /* Adding 1 more byte should fail */
+ || WPACKET_put_bytes_u8(&pkt, 0xff)
+ /* Finishing the top level WPACKET should succeed */
+ || !WPACKET_finish(&pkt)
+ || !WPACKET_get_total_written(&pkt, &written)
+ || written != sizeof(fixed)
+ || memcmp(sbuf, fixed, sizeof(sbuf)) != 0
+ /* Initialise with 1 len byte */
+ || !WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 1)
+ /* Adding 2 bytes should succeed */
+ || !WPACKET_put_bytes_u16(&pkt, 0xfeff)
+ /* Adding 1 more byte should fail */
+ || WPACKET_put_bytes_u8(&pkt, 0xff)
+ || !WPACKET_finish(&pkt)
+ || !WPACKET_get_total_written(&pkt, &written)
+ || written != sizeof(alloc)
+ || memcmp(sbuf, alloc, written) != 0) {
+ testfail("test_WPACKET_init():5 failed\n", &pkt);
+ return 0;
+ }
+
return 1;
}
|| !WPACKET_set_max_size(&pkt, SIZE_MAX)
|| !WPACKET_finish(&pkt)) {
testfail("test_WPACKET_set_max_size():1 failed\n", &pkt);
- return 0;
+ return 0;
}
if (!WPACKET_init_len(&pkt, buf, 1)
/*
* Should fail because packet is already filled
*/
- || WPACKET_put_bytes(&pkt, 0xff, 1)
+ || WPACKET_put_bytes_u8(&pkt, 0xff)
/*
* You can't put in more bytes than max size
*/
|| !WPACKET_set_max_size(&pkt, 0x02)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
- || WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
+ || WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(simple2)
if (!WPACKET_init(&pkt, buf)
|| !WPACKET_start_sub_packet(&pkt)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
/* Can't finish because we have a sub packet */
|| WPACKET_finish(&pkt)
|| !WPACKET_close(&pkt)
/* Single sub-packet with length prefix */
if (!WPACKET_init(&pkt, buf)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
/* Nested sub-packets with length prefixes */
if (!WPACKET_init(&pkt, buf)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_get_length(&pkt, &len)
|| len != 1
|| !WPACKET_close(&pkt)
/* Sequential sub-packets with length prefixes */
if (!WPACKET_init(&pkt, buf)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_close(&pkt)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
return 0;
}
+ /* Nested sub-packets with lengths filled before finish */
+ if (!WPACKET_init(&pkt, buf)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
+ || !WPACKET_get_length(&pkt, &len)
+ || len != 1
+ || !WPACKET_close(&pkt)
+ || !WPACKET_get_length(&pkt, &len)
+ || len != 3
+ || !WPACKET_close(&pkt)
+ || !WPACKET_fill_lengths(&pkt)
+ || !WPACKET_get_total_written(&pkt, &written)
+ || written != sizeof(nestedsub)
+ || memcmp(buf->data, &nestedsub, written) != 0
+ || !WPACKET_finish(&pkt)) {
+ testfail("test_WPACKET_start_sub_packet():5 failed\n", &pkt);
+ return 0;
+ }
+
return 1;
}
|| !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
/* Should fail because of zero length */
|| WPACKET_finish(&pkt)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(simple1)
|| !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
/* Should fail because of zero length */
|| WPACKET_close(&pkt)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
/* Repeat above test but only abandon a sub-packet */
if (!WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
|| !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
/* And repeat with a non empty sub-packet */
if (!WPACKET_init(&pkt, buf)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
|| !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
/* Repeat with WPACKET_sub_allocate_bytes */
if (!WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_sub_allocate_bytes(&pkt, 2, &bytes, 1)) {
+ || !WPACKET_sub_allocate_bytes_u8(&pkt, 2, &bytes)) {
testfail("test_WPACKET_allocate_bytes():3 failed\n", &pkt);
return 0;
}
/* Repeat with WPACKET_sub_memcpy() */
if (!WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_sub_memcpy(&pkt, bytes, sizeof(bytes), 1)
+ || !WPACKET_sub_memcpy_u8(&pkt, bytes, sizeof(bytes))
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(submem)
return 1;
}
-int main(int argc, char *argv[])
+int test_main(int argc, char *argv[])
{
- BIO *err = NULL;
int testresult = 0;
- err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-
- CRYPTO_set_mem_debug(1);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
buf = BUF_MEM_new();
if (buf != NULL) {
ADD_TEST(test_WPACKET_init);
BUF_MEM_free(buf);
}
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
- if (CRYPTO_mem_leaks(err) <= 0)
- testresult = 1;
-#endif
- BIO_free(err);
-
- if (!testresult)
- printf("PASS\n");
-
return testresult;
}
-