int i;
size_t written;
- if ( !WPACKET_init(&pkt, buf)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ if (!WPACKET_init(&pkt, buf)
+ || !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)
+ if (!WPACKET_init_len(&pkt, buf, 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)
+ if (!WPACKET_init_len(&pkt, buf, 4)
+ || !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 1;
}
-static int test_WPACKET_set_packet_len(void)
-{
- WPACKET pkt;
- size_t written;
- unsigned char len;
-
- /*
- * Calling set_packet_len when the packet len is already set
- * should fail
- */
- if ( !WPACKET_init_len(&pkt, buf, 1)
- || WPACKET_set_packet_len(&pkt, &len, sizeof(len))
- || !WPACKET_finish(&pkt)) {
- testfail("test_WPACKET_set_packet_len():1 failed\n", &pkt);
- return 0;
- }
-
- if ( !WPACKET_init(&pkt, buf)
- || !WPACKET_set_packet_len(&pkt, &len, sizeof(len))
- /* Can't set it again */
- || WPACKET_set_packet_len(&pkt, &len, sizeof(len))
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
- || !WPACKET_finish(&pkt)
- || !WPACKET_get_total_written(&pkt, &written)
- || written != sizeof(simple1)
- || memcmp(buf->data, &simple1, written) != 0
- || len != 1) {
- testfail("test_WPACKET_set_packet_len():2 failed\n", &pkt);
- return 0;
- }
-
- return 1;
-}
-
static int test_WPACKET_set_max_size(void)
{
WPACKET pkt;
size_t written;
- unsigned char len;
- if ( !WPACKET_init(&pkt, buf)
+ if (!WPACKET_init(&pkt, buf)
/*
* No previous lenbytes set so we should be ok to set the max
* possible max size
|| !WPACKET_set_max_size(&pkt, SIZE_MAX -1)
/* And setting it bigger again should be ok */
|| !WPACKET_set_max_size(&pkt, SIZE_MAX)
- || !WPACKET_set_packet_len(&pkt, &len, 1)
+ || !WPACKET_finish(&pkt)) {
+ testfail("test_WPACKET_set_max_size():1 failed\n", &pkt);
+ return 0;
+ }
+
+ if (!WPACKET_init_len(&pkt, buf, 1)
+ /*
+ * Should fail because we already consumed 1 byte with the
+ * length
+ */
+ || WPACKET_set_max_size(&pkt, 0)
/*
* Max size can't be bigger than biggest that will fit in
* lenbytes
*/
|| WPACKET_set_max_size(&pkt, 0x0101)
/* It can be the same as the maximum possible size */
- || !WPACKET_set_max_size(&pkt, 0xff)
+ || !WPACKET_set_max_size(&pkt, 0x0100)
/* Or it can be less */
- || !WPACKET_set_max_size(&pkt, 0x00)
+ || !WPACKET_set_max_size(&pkt, 0x01)
/*
* 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, 0x01)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
- || WPACKET_put_bytes(&pkt, 0xff, 1)
- || !WPACKET_finish(&pkt)
- || !WPACKET_get_total_written(&pkt, &written)
- || written != sizeof(simple1)
- || memcmp(buf->data, &simple1, written) != 0
- || len != 1) {
- testfail("test_WPACKET_set_max_size():1 failed\n", &pkt);
- return 0;
- }
-
- if ( !WPACKET_init_len(&pkt, buf, 1)
- /*
- * Should fail because we already consumed 1 byte with the
- * length
- */
- || WPACKET_set_max_size(&pkt, 0)
- || !WPACKET_set_max_size(&pkt, 1)
- || WPACKET_put_bytes(&pkt, 0xff, 1)
- || !WPACKET_set_max_size(&pkt, 2)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
- || WPACKET_put_bytes(&pkt, 0xff, 1)
+ || !WPACKET_set_max_size(&pkt, 0x02)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
+ || WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(simple2)
- || memcmp(buf->data, &simple2, written) != 0
- || len != 1) {
+ || memcmp(buf->data, &simple2, written) != 0) {
testfail("test_WPACKET_set_max_size():2 failed\n", &pkt);
return 0;
}
size_t written;
size_t len;
- if ( !WPACKET_init(&pkt, buf)
+ 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)
+ if (!WPACKET_init(&pkt, buf)
+ || !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)
+ 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)
}
/* Sequential sub-packets with length prefixes */
- if ( !WPACKET_init(&pkt, buf)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ if (!WPACKET_init(&pkt, buf)
+ || !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)
size_t written;
/* Set packet to be non-zero length */
- if ( !WPACKET_init(&pkt, buf)
- || !WPACKET_set_flags(&pkt, OPENSSL_WPACKET_FLAGS_NON_ZERO_LENGTH)
+ if (!WPACKET_init(&pkt, buf)
+ || !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)
}
/* Repeat above test in a sub-packet */
- if ( !WPACKET_init(&pkt, buf)
+ if (!WPACKET_init(&pkt, buf)
|| !WPACKET_start_sub_packet(&pkt)
- || !WPACKET_set_flags(&pkt, OPENSSL_WPACKET_FLAGS_NON_ZERO_LENGTH)
+ || !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)
}
/* Set packet to abandon non-zero length */
- if ( !WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_set_flags(&pkt,
- OPENSSL_WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+ if (!WPACKET_init_len(&pkt, buf, 1)
+ || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != 0) {
}
/* Repeat above test but only abandon a sub-packet */
- if ( !WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_set_flags(&pkt,
- OPENSSL_WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+ if (!WPACKET_init_len(&pkt, buf, 1)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
}
/* And repeat with a non empty sub-packet */
- if ( !WPACKET_init(&pkt, buf)
- || !WPACKET_start_sub_packet_len(&pkt, 1)
- || !WPACKET_set_flags(&pkt,
- OPENSSL_WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
- || !WPACKET_put_bytes(&pkt, 0xff, 1)
+ if (!WPACKET_init(&pkt, buf)
+ || !WPACKET_start_sub_packet_u8(&pkt)
+ || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+ || !WPACKET_put_bytes_u8(&pkt, 0xff)
|| !WPACKET_close(&pkt)
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
size_t written;
unsigned char *bytes;
- if ( !WPACKET_init_len(&pkt, buf, 1)
+ if (!WPACKET_init_len(&pkt, buf, 1)
|| !WPACKET_allocate_bytes(&pkt, 2, &bytes)) {
testfail("test_WPACKET_allocate_bytes():1 failed\n", &pkt);
return 0;
}
bytes[0] = 0xfe;
bytes[1] = 0xff;
- if ( !WPACKET_finish(&pkt)
+ if (!WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(alloc)
|| memcmp(buf->data, &alloc, written) != 0) {
return 0;
}
+ /* Repeat with WPACKET_sub_allocate_bytes */
+ if (!WPACKET_init_len(&pkt, buf, 1)
+ || !WPACKET_sub_allocate_bytes_u8(&pkt, 2, &bytes)) {
+ testfail("test_WPACKET_allocate_bytes():3 failed\n", &pkt);
+ return 0;
+ }
+ bytes[0] = 0xfe;
+ bytes[1] = 0xff;
+ if (!WPACKET_finish(&pkt)
+ || !WPACKET_get_total_written(&pkt, &written)
+ || written != sizeof(submem)
+ || memcmp(buf->data, &submem, written) != 0) {
+ testfail("test_WPACKET_allocate_bytes():4 failed\n", &pkt);
+ return 0;
+ }
+
return 1;
}
size_t written;
const unsigned char bytes[] = { 0xfe, 0xff };
- if ( !WPACKET_init_len(&pkt, buf, 1)
+ if (!WPACKET_init_len(&pkt, buf, 1)
|| !WPACKET_memcpy(&pkt, bytes, sizeof(bytes))
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
}
/* Repeat with WPACKET_sub_memcpy() */
- if ( !WPACKET_init_len(&pkt, buf, 1)
- || !WPACKET_sub_memcpy(&pkt, bytes, sizeof(bytes), 1)
+ if (!WPACKET_init_len(&pkt, buf, 1)
+ || !WPACKET_sub_memcpy_u8(&pkt, bytes, sizeof(bytes))
|| !WPACKET_finish(&pkt)
|| !WPACKET_get_total_written(&pkt, &written)
|| written != sizeof(submem)
buf = BUF_MEM_new();
if (buf != NULL) {
ADD_TEST(test_WPACKET_init);
- ADD_TEST(test_WPACKET_set_packet_len);
ADD_TEST(test_WPACKET_set_max_size);
ADD_TEST(test_WPACKET_start_sub_packet);
ADD_TEST(test_WPACKET_set_flags);