projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
testutil: always print errors on failure
[openssl.git] / test / wpackettest.c
diff --git a/test/wpackettest.c b/test/wpackettest.c
index c2e194e6e528e7c2549a16e6182cb228fdfd6072..aabf781952602d36ec63bfba2e9256cc5b03c5f6 100644 (file)
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -35,8 +35,8 @@ static int test_WPACKET_init(void)
     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 */
@@ -55,8 +55,8 @@ static int test_WPACKET_init(void)
     }
 
     /* 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)
@@ -66,8 +66,8 @@ static int test_WPACKET_init(void)
     }
 
     /* 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)
@@ -85,7 +85,7 @@ static int test_WPACKET_init(void)
          * 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;
         }
@@ -103,7 +103,7 @@ static int test_WPACKET_set_max_size(void)
     WPACKET pkt;
     size_t written;
 
-    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
@@ -115,10 +115,10 @@ static int test_WPACKET_set_max_size(void)
             || !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)
+    if (!WPACKET_init_len(&pkt, buf, 1)
                 /*
                  * Should fail because we already consumed 1 byte with the
                  * length
@@ -136,13 +136,13 @@ static int test_WPACKET_set_max_size(void)
                 /*
                  * 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)
@@ -160,9 +160,9 @@ static int test_WPACKET_start_sub_packet(void)
     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)
@@ -178,9 +178,9 @@ static int test_WPACKET_start_sub_packet(void)
     }
 
    /* 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)
@@ -191,11 +191,11 @@ static int test_WPACKET_start_sub_packet(void)
     }
 
     /* 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)
@@ -211,12 +211,12 @@ static int test_WPACKET_start_sub_packet(void)
     }
 
     /* 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)
@@ -236,11 +236,11 @@ static int test_WPACKET_set_flags(void)
     size_t written;
 
     /* Set packet to be non-zero length */
-    if (       !WPACKET_init(&pkt, buf)
+    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)
@@ -250,12 +250,12 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* 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, 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)
@@ -266,7 +266,7 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* Set packet to abandon non-zero length */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
+    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)
@@ -276,8 +276,8 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* Repeat above test but only abandon a sub-packet */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_start_sub_packet_len(&pkt, 1)
+    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)
@@ -289,10 +289,10 @@ static int test_WPACKET_set_flags(void)
     }
 
     /* And repeat with a non empty sub-packet */
-    if (       !WPACKET_init(&pkt, buf)
-            || !WPACKET_start_sub_packet_len(&pkt, 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(&pkt, 0xff, 1)
+            || !WPACKET_put_bytes_u8(&pkt, 0xff)
             || !WPACKET_close(&pkt)
             || !WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
@@ -310,14 +310,14 @@ static int test_WPACKET_allocate_bytes(void)
     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) {
@@ -326,14 +326,14 @@ static int test_WPACKET_allocate_bytes(void)
     }
 
     /* Repeat with WPACKET_sub_allocate_bytes */
-    if (       !WPACKET_init_len(&pkt, buf, 1)
-            || !WPACKET_sub_allocate_bytes(&pkt, 2, &bytes, 1)) {
+    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)
+    if (!WPACKET_finish(&pkt)
             || !WPACKET_get_total_written(&pkt, &written)
             ||  written != sizeof(submem)
             ||  memcmp(buf->data, &submem, written) != 0) {
@@ -350,7 +350,7 @@ static int test_WPACKET_memcpy(void)
     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)
@@ -361,8 +361,8 @@ static int test_WPACKET_memcpy(void)
     }
 
     /* 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)
Unnamed repository; edit this file 'description' to name the repository.