]> git.ipfire.org Git - thirdparty/openssl.git/blobdiff - test/wpackettest.c
Fix various typos, repeated words, align some spelling to LDP.
[thirdparty/openssl.git] / test / wpackettest.c
index 3ab293e0e98c8d43cc7bade97921c9d894d685cf..0aea34188b65525dda0f0a5bc789d2028e8f2b21 100644 (file)
@@ -1,7 +1,7 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 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
@@ -9,26 +9,53 @@
 
 #include <string.h>
 #include <openssl/buffer.h>
-#include "../ssl/packet_locl.h"
+#include <openssl/rand.h>
+#include "internal/packet.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 simple3[] = { 0x00, 0x00, 0x00, 0x01, 0xff };
-const static unsigned char nestedsub[] = { 0x03, 0xff, 0x01, 0xff };
-const static unsigned char seqsub[] = { 0x01, 0xff, 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 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 const unsigned char simpleder[] = {
+    0xfc, 0x04, 0x00, 0x01, 0x02, 0x03, 0xff, 0xfe, 0xfd
+};
+
+/* QUIC sub-packet with 4-byte length prefix, containing a 1-byte vlint */
+static const unsigned char quic1[] = { 0x80, 0x00, 0x00, 0x01, 0x09 };
+/* QUIC sub-packet with 1-byte length prefix, containing a 1-byte vlint */
+static const unsigned char quic2[] = { 0x01, 0x09 };
+/* QUIC sub-packet with 2-byte length prefix, containing a 2-byte vlint */
+static const unsigned char quic3[] = { 0x40, 0x02, 0x40, 0x41 };
+/* QUIC sub-packet with 8-byte length prefix, containing a 4-byte vlint */
+static const unsigned char quic4[] = {
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+    0x80, 0x01, 0x3c, 0x6a
+};
+/* QUIC sub-packet with 8-byte length prefix, containing a 8-byte vlint */
+static const unsigned char quic5[] = {
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+    0xef, 0x77, 0x21, 0x3f, 0x3f, 0x50, 0x5b, 0xa5
+};
+/* QUIC sub-packet, length known up-front */
+static const unsigned char quic6[] = { 0x03, 0x55, 0x66, 0x77 };
+/* Nested and sequential sub-packets with length prefixes */
+static const unsigned char quic7[] = {
+    0x07, 0x80, 0x00, 0x00, 0x08, 0x65, 0x14, 0x40, 0x01, 0x05,
+    0x40, 0x01, 0x11, 0x40, 0x01, 0x12, 0x40, 0x01, 0x13
+};
 
 static BUF_MEM *buf;
 
-static void testfail(const char *msg, WPACKET *pkt)
+static int cleanup(WPACKET *pkt)
 {
-    fprintf(stderr, "%s", msg);
     WPACKET_cleanup(pkt);
+    return 0;
 }
 
 static int test_WPACKET_init(void)
@@ -38,90 +65,71 @@ static int test_WPACKET_init(void)
     size_t written;
     unsigned char sbuf[3];
 
-    if (!WPACKET_init(&pkt, buf)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
                 /* Closing a top level WPACKET should fail */
-            ||  WPACKET_close(&pkt)
+            || !TEST_false(WPACKET_close(&pkt))
                 /* Finishing a top level WPACKET should succeed */
-            || !WPACKET_finish(&pkt)
+            || !TEST_true(WPACKET_finish(&pkt))
                 /*
                  * Can't call close or finish on a WPACKET that's already
                  * finished.
                  */
-            ||  WPACKET_close(&pkt)
-            ||  WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(simple1)
-            ||  memcmp(buf->data, &simple1, written) != 0) {
-        testfail("test_WPACKET_init():1 failed\n", &pkt);
-        return 0;
-    }
+            || !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 (!WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(simple2)
-            ||  memcmp(buf->data, &simple2, written) != 0) {
-        testfail("test_WPACKET_init():2 failed\n", &pkt);
-        return 0;
-    }
+    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 (!WPACKET_init_len(&pkt, buf, 4)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(simple3)
-            ||  memcmp(buf->data, &simple3, written) != 0) {
-        testfail("test_WPACKET_init():3 failed\n", &pkt);
-        return 0;
-    }
-
-    if (!WPACKET_init_len(&pkt, buf, 1)) {
-        testfail("test_WPACKET_init():4 failed\n", &pkt);
-        return 0;
-    }
+    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 ((!WPACKET_put_bytes_u8(&pkt, 0xff)) == (i != 256)) {
-            testfail("test_WPACKET_init():4 failed\n", &pkt);
-            return 0;
-        }
-    }
-    if (!WPACKET_finish(&pkt)) {
-        testfail("test_WPACKET_init():4 failed\n", &pkt);
-        return 0;
+        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 (!WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 0)
+    if (!TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 0))
                 /* Adding 3 bytes should succeed */
-            || !WPACKET_put_bytes_u24(&pkt, 0xffffff)
+            || !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xffffff))
                 /* Adding 1 more byte should fail */
-            ||  WPACKET_put_bytes_u8(&pkt, 0xff)
+            || !TEST_false(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
+            || !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 */
-            || !WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 1)
+            || !TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 1))
                 /* Adding 2 bytes should succeed */
-            || !WPACKET_put_bytes_u16(&pkt, 0xfeff)
+            || !TEST_true(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;
-    }
+            || !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;
 }
@@ -131,53 +139,44 @@ static int test_WPACKET_set_max_size(void)
     WPACKET pkt;
     size_t written;
 
-    if (!WPACKET_init(&pkt, buf)
+    if (!TEST_true(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)
+            || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
                 /* We should be able to set it smaller too */
-            || !WPACKET_set_max_size(&pkt, SIZE_MAX -1)
+            || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX -1))
                 /* And setting it bigger again should be ok */
-            || !WPACKET_set_max_size(&pkt, SIZE_MAX)
-            || !WPACKET_finish(&pkt)) {
-        testfail("test_WPACKET_set_max_size():1 failed\n", &pkt);
-        return 0;
-    }
+            || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
+            || !TEST_true(WPACKET_finish(&pkt)))
+        return cleanup(&pkt);
 
-    if (!WPACKET_init_len(&pkt, buf, 1)
+    if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
                 /*
                  * Should fail because we already consumed 1 byte with the
                  * length
                  */
-            ||  WPACKET_set_max_size(&pkt, 0)
+            || !TEST_false(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)
+            || !TEST_false(WPACKET_set_max_size(&pkt, 0x0101))
                 /* It can be the same as the maximum possible size */
-            || !WPACKET_set_max_size(&pkt, 0x0100)
+            || !TEST_true(WPACKET_set_max_size(&pkt, 0x0100))
                 /* Or it can be less */
-            || !WPACKET_set_max_size(&pkt, 0x01)
-                /*
-                 * Should fail because packet is already filled
-                 */
-            ||  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_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) {
-        testfail("test_WPACKET_set_max_size():2 failed\n", &pkt);
-        return 0;
-    }
+            || !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;
 }
@@ -188,92 +187,77 @@ static int test_WPACKET_start_sub_packet(void)
     size_t written;
     size_t len;
 
-    if (!WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet(&pkt)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
+    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 */
-            ||  WPACKET_finish(&pkt)
-            || !WPACKET_close(&pkt)
+            || !TEST_false(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_close(&pkt))
                 /* Sub packet is closed so can't close again */
-            ||  WPACKET_close(&pkt)
+            || !TEST_false(WPACKET_close(&pkt))
                 /* Now a top level so finish should succeed */
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(simple1)
-            ||  memcmp(buf->data, &simple1, written) != 0) {
-        testfail("test_WPACKET_start_sub_packet():1 failed\n", &pkt);
-        return 0;
-    }
+            || !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 (!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)
-            ||  written != sizeof(simple2)
-            ||  memcmp(buf->data, &simple2, written) != 0) {
-        testfail("test_WPACKET_start_sub_packet():2 failed\n", &pkt);
-        return 0;
-    }
+    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 (!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_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(nestedsub)
-            ||  memcmp(buf->data, &nestedsub, written) != 0) {
-        testfail("test_WPACKET_start_sub_packet():3 failed\n", &pkt);
-        return 0;
-    }
+    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 (!WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
-            || !WPACKET_close(&pkt)
-            || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
-            || !WPACKET_close(&pkt)
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(seqsub)
-            ||  memcmp(buf->data, &seqsub, written) != 0) {
-        testfail("test_WPACKET_start_sub_packet():4 failed\n", &pkt);
-        return 0;
-    }
+    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 (!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;
-    }
+    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;
 }
@@ -285,71 +269,57 @@ static int test_WPACKET_set_flags(void)
     size_t written;
 
     /* Set packet to be non-zero length */
-    if (!WPACKET_init(&pkt, buf)
-            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_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 */
-            ||  WPACKET_finish(&pkt)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(simple1)
-            ||  memcmp(buf->data, &simple1, written) != 0) {
-        testfail("test_WPACKET_set_flags():1 failed\n", &pkt);
-        return 0;
-    }
+            || !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 (!WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet(&pkt)
-            || !WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
+    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 */
-            ||  WPACKET_close(&pkt)
-            || !WPACKET_put_bytes_u8(&pkt, 0xff)
-            || !WPACKET_close(&pkt)
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(simple1)
-            ||  memcmp(buf->data, &simple1, written) != 0) {
-        testfail("test_WPACKET_set_flags():2 failed\n", &pkt);
-        return 0;
-    }
+            || !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 (!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) {
-        testfail("test_WPACKET_set_flags():3 failed\n", &pkt);
-        return 0;
-    }
+    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 (!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)
-            ||  written != sizeof(empty)
-            ||  memcmp(buf->data, &empty, written) != 0) {
-        testfail("test_WPACKET_set_flags():4 failed\n", &pkt);
-        return 0;
-    }
+    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 (!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)
-            ||  written != sizeof(simple2)
-            ||  memcmp(buf->data, &simple2, written) != 0) {
-        testfail("test_WPACKET_set_flags():5 failed\n", &pkt);
-        return 0;
-    }
+    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;
 }
 
@@ -359,36 +329,26 @@ static int test_WPACKET_allocate_bytes(void)
     size_t written;
     unsigned char *bytes;
 
-    if (!WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_allocate_bytes(&pkt, 2, &bytes)) {
-        testfail("test_WPACKET_allocate_bytes():1 failed\n", &pkt);
-        return 0;
-    }
+    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 (!WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(alloc)
-            ||  memcmp(buf->data, &alloc, written) != 0) {
-        testfail("test_WPACKET_allocate_bytes():2 failed\n", &pkt);
-        return 0;
-    }
+    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 (!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;
-    }
+    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 (!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;
-    }
+    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;
 }
@@ -399,47 +359,286 @@ static int test_WPACKET_memcpy(void)
     size_t written;
     const unsigned char bytes[] = { 0xfe, 0xff };
 
-    if (!WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_memcpy(&pkt, bytes, sizeof(bytes))
-            || !WPACKET_finish(&pkt)
-            || !WPACKET_get_total_written(&pkt, &written)
-            ||  written != sizeof(alloc)
-            ||  memcmp(buf->data, &alloc, written) != 0) {
-        testfail("test_WPACKET_memcpy():1 failed\n", &pkt);
-        return 0;
-    }
+    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 (!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)
-            ||  memcmp(buf->data, &submem, written) != 0) {
-        testfail("test_WPACKET_memcpy():2 failed\n", &pkt);
+    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;
+}
+
+static int test_WPACKET_init_der(void)
+{
+    WPACKET pkt;
+    unsigned char sbuf[1024];
+    unsigned char testdata[] = { 0x00, 0x01, 0x02, 0x03 };
+    unsigned char testdata2[259]  = { 0x82, 0x01, 0x00 };
+    size_t written[2];
+    size_t size1, size2;
+    int flags = WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH;
+    int i;
+
+    /* Test initialising for writing DER */
+    if (!TEST_true(WPACKET_init_der(&pkt, sbuf, sizeof(sbuf)))
+            || !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xfffefd))
+               /* Test writing data in a length prefixed sub-packet */
+            || !TEST_true(WPACKET_start_sub_packet(&pkt))
+            || !TEST_true(WPACKET_memcpy(&pkt, testdata, sizeof(testdata)))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xfc))
+            /* this sub-packet is empty, and should render zero bytes */
+            || (!TEST_true(WPACKET_start_sub_packet(&pkt))
+                || !TEST_true(WPACKET_set_flags(&pkt, flags))
+                || !TEST_true(WPACKET_get_total_written(&pkt, &size1))
+                || !TEST_true(WPACKET_close(&pkt))
+                || !TEST_true(WPACKET_get_total_written(&pkt, &size2))
+                || !TEST_size_t_eq(size1, size2))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written[0]))
+            || !TEST_mem_eq(WPACKET_get_curr(&pkt), written[0], simpleder,
+                            sizeof(simpleder)))
+        return cleanup(&pkt);
+
+    /* Generate random packet data for test */
+    if (!TEST_int_gt(RAND_bytes(&testdata2[3], sizeof(testdata2) - 3), 0))
         return 0;
+
+    /*
+     * Test with a sub-packet that has 2 length bytes. We do 2 passes - first
+     * with a NULL buffer, just to calculate lengths, and a second pass with a
+     * real buffer to actually generate a packet
+     */
+    for (i = 0; i < 2; i++) {
+        if (i == 0) {
+            if (!TEST_true(WPACKET_init_null_der(&pkt)))
+                return 0;
+        } else { 
+            if (!TEST_true(WPACKET_init_der(&pkt, sbuf, sizeof(sbuf))))
+                return 0;
+        }
+        if (!TEST_true(WPACKET_start_sub_packet(&pkt))
+            || !TEST_true(WPACKET_memcpy(&pkt, &testdata2[3],
+                                         sizeof(testdata2) - 3))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written[i])))
+        return cleanup(&pkt);
     }
 
+    /*
+     * Check that the size calculated in the first pass equals the size of the
+     * packet actually generated in the second pass. Also check the generated
+     * packet looks as we expect it to.
+     */
+    if (!TEST_size_t_eq(written[0], written[1])
+            || !TEST_mem_eq(WPACKET_get_curr(&pkt), written[1], testdata2,
+                            sizeof(testdata2)))
+        return 0;
+
+    return 1;
+}
+
+static int test_WPACKET_quic(void)
+{
+    WPACKET pkt;
+    size_t written, len;
+    unsigned char *bytes;
+
+    /* QUIC sub-packet with 4-byte length prefix, containing a 1-byte vlint */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_start_quic_sub_packet(&pkt))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x09))
+                /* 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, quic1, sizeof(quic1)))
+        return cleanup(&pkt);
+
+    /* QUIC sub-packet with 1-byte length prefix, containing a 1-byte vlint */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_1B_MAX))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x09))
+            || !TEST_false(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_false(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+            || !TEST_mem_eq(buf->data, written, quic2, sizeof(quic2)))
+        return cleanup(&pkt);
+
+    /* QUIC sub-packet with 2-byte length prefix, containing a 2-byte vlint */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x41))
+            || !TEST_false(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_false(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+            || !TEST_mem_eq(buf->data, written, quic3, sizeof(quic3)))
+        return cleanup(&pkt);
+
+    /* QUIC sub-packet with 8-byte length prefix, containing a 4-byte vlint */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_8B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x13c6a))
+            || !TEST_false(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_false(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+            || !TEST_mem_eq(buf->data, written, quic4, sizeof(quic4)))
+        return cleanup(&pkt);
+
+    /* QUIC sub-packet with 8-byte length prefix, containing a 8-byte vlint */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_8B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x2f77213f3f505ba5ULL))
+            || !TEST_false(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_false(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+            || !TEST_mem_eq(buf->data, written, quic5, sizeof(quic5)))
+        return cleanup(&pkt);
+
+    /* QUIC sub-packet, length known up-front */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_quic_sub_allocate_bytes(&pkt, 3, &bytes)))
+        return cleanup(&pkt);
+
+    bytes[0] = 0x55;
+    bytes[1] = 0x66;
+    bytes[2] = 0x77;
+
+    if (!TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+            || !TEST_mem_eq(buf->data, written, quic6, sizeof(quic6)))
+        return cleanup(&pkt);
+
+    /* Nested and sequential sub-packets with length prefixes */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x07))
+            || !TEST_true(WPACKET_get_length(&pkt, &len))
+            || !TEST_size_t_eq(len, 1)
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_4B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x2514))
+            || !TEST_true(WPACKET_get_length(&pkt, &len))
+            || !TEST_size_t_eq(len, 2)
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x05))
+            || !TEST_true(WPACKET_get_length(&pkt, &len))
+            || !TEST_size_t_eq(len, 1)
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x11))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_get_length(&pkt, &len))
+            || !TEST_size_t_eq(len, 8)
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x12))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x13))
+            || !TEST_true(WPACKET_close(&pkt))
+            || !TEST_true(WPACKET_finish(&pkt))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+            || !TEST_mem_eq(buf->data, written, quic7, sizeof(quic7)))
+        return cleanup(&pkt);
+
+    /* Trying to encode a value above OSSL_QUIC_VLINT_MAX should fail */
+    if (!TEST_true(WPACKET_init(&pkt, buf))
+            || !TEST_false(WPACKET_quic_write_vlint(&pkt, OSSL_QUIC_VLINT_MAX+1))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, OSSL_QUIC_VLINT_MAX)))
+            return cleanup(&pkt);
+
+    WPACKET_cleanup(&pkt);
     return 1;
 }
 
-int test_main(int argc, char *argv[])
+static int test_WPACKET_quic_vlint_random(void)
 {
-    int testresult = 0;
+    size_t i, written;
+    uint64_t expected, actual = 0;
+    unsigned char rand_data[9];
+    WPACKET pkt;
+    PACKET read_pkt = {0};
+
+    for (i = 0; i < 10000; ++i) {
+        if (!TEST_int_gt(RAND_bytes(rand_data, sizeof(rand_data)), 0))
+            return cleanup(&pkt);
+
+        expected = *(uint64_t*)rand_data;
 
-    buf = BUF_MEM_new();
-    if (buf != NULL) {
-        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);
+        /*
+         * Ensure that all size classes get tested with equal probability.
+         */
+        switch (rand_data[8] & 3) {
+            case 0:
+                expected &= OSSL_QUIC_VLINT_1B_MAX;
+                break;
+            case 1:
+                expected &= OSSL_QUIC_VLINT_2B_MAX;
+                break;
+            case 2:
+                expected &= OSSL_QUIC_VLINT_4B_MAX;
+                break;
+            case 3:
+                expected &= OSSL_QUIC_VLINT_8B_MAX;
+                break;
+        }
 
-        testresult = run_tests(argv[0]);
+        if (!TEST_true(WPACKET_init(&pkt, buf))
+                || !TEST_true(WPACKET_quic_write_vlint(&pkt, expected))
+                || !TEST_true(WPACKET_get_total_written(&pkt, &written)))
+            return cleanup(&pkt);
 
-        BUF_MEM_free(buf);
+        if (!TEST_true(PACKET_buf_init(&read_pkt, (unsigned char *)buf->data, written))
+                || !TEST_true(PACKET_get_quic_vlint(&read_pkt, &actual))
+                || !TEST_uint64_t_eq(expected, actual))
+            return cleanup(&pkt);
+
+        WPACKET_cleanup(&pkt);
     }
 
-    return testresult;
+    WPACKET_cleanup(&pkt);
+    return 1;
+}
+
+int setup_tests(void)
+{
+    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);
+    ADD_TEST(test_WPACKET_init_der);
+    ADD_TEST(test_WPACKET_quic);
+    ADD_TEST(test_WPACKET_quic_vlint_random);
+    return 1;
+}
+
+void cleanup_tests(void)
+{
+    BUF_MEM_free(buf);
 }