projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
PACKET: add methods for reading length-prefixed TLS vectors.
[openssl.git] / test / packettest.c
diff --git a/test/packettest.c b/test/packettest.c
index 92181e6ceff18c289683d0594001b6f4cbbff898..b3f7bbb19e428a4ae260b3aa9a5e1bc451dad7a4 100644 (file)
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -67,7 +67,7 @@ static int test_PACKET_remaining(PACKET *pkt)
             || !PACKET_forward(pkt, BUF_LEN - 1)
             ||  PACKET_remaining(pkt) != 1
             || !PACKET_forward(pkt, 1)
-            ||  PACKET_remaining(pkt)) {
+            ||  PACKET_remaining(pkt) != 0) {
         fprintf(stderr, "test_PACKET_remaining() failed\n");
         return 0;
     }
@@ -81,10 +81,10 @@ static int test_PACKET_get_1(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_1(pkt, &i)
-            ||  i != 0x01
+            ||  i != 0x02
             || !PACKET_forward(pkt, BUF_LEN - 2)
             || !PACKET_get_1(pkt, &i)
-            ||  i != 0xff
+            ||  i != 0xfe
             ||  PACKET_get_1(pkt, &i)) {
         fprintf(stderr, "test_PACKET_get_1() failed\n");
         return 0;
@@ -99,10 +99,10 @@ static int test_PACKET_get_4(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_4(pkt, &i)
-            ||  i != 0x04030201UL
+            ||  i != 0x08060402UL
             || !PACKET_forward(pkt, BUF_LEN - 8)
             || !PACKET_get_4(pkt, &i)
-            ||  i != 0xfffefdfcUL
+            ||  i != 0xfefcfaf8UL
             ||  PACKET_get_4(pkt, &i)) {
         fprintf(stderr, "test_PACKET_get_4() failed\n");
         return 0;
@@ -117,10 +117,10 @@ static int test_PACKET_get_net_2(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_net_2(pkt, &i)
-            ||  i != 0x0102
+            ||  i != 0x0204
             || !PACKET_forward(pkt, BUF_LEN - 4)
             || !PACKET_get_net_2(pkt, &i)
-            ||  i != 0xfeff
+            ||  i != 0xfcfe
             ||  PACKET_get_net_2(pkt, &i)) {
         fprintf(stderr, "test_PACKET_get_net_2() failed\n");
         return 0;
@@ -135,10 +135,10 @@ static int test_PACKET_get_net_3(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_net_3(pkt, &i)
-            ||  i != 0x010203UL
+            ||  i != 0x020406UL
             || !PACKET_forward(pkt, BUF_LEN - 6)
             || !PACKET_get_net_3(pkt, &i)
-            ||  i != 0xfdfeffUL
+            ||  i != 0xfafcfeUL
             ||  PACKET_get_net_3(pkt, &i)) {
         fprintf(stderr, "test_PACKET_get_net_3() failed\n");
         return 0;
@@ -153,10 +153,10 @@ static int test_PACKET_get_net_4(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_net_4(pkt, &i)
-            ||  i != 0x01020304UL
+            ||  i != 0x02040608UL
             || !PACKET_forward(pkt, BUF_LEN - 8)
             || !PACKET_get_net_4(pkt, &i)
-            ||  i != 0xfcfdfeffUL
+            ||  i != 0xf8fafcfeUL
             ||  PACKET_get_net_4(pkt, &i)) {
         fprintf(stderr, "test_PACKET_get_net_4() failed\n");
         return 0;
@@ -173,12 +173,12 @@ static int test_PACKET_get_sub_packet(PACKET *pkt, size_t start)
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_sub_packet(pkt, &subpkt, 4)
             || !PACKET_get_net_4(&subpkt, &i)
-            ||  i != 0x01020304UL
+            ||  i != 0x02040608UL
             ||  PACKET_remaining(&subpkt)
             || !PACKET_forward(pkt, BUF_LEN - 8)
             || !PACKET_get_sub_packet(pkt, &subpkt, 4)
             || !PACKET_get_net_4(&subpkt, &i)
-            ||  i != 0xfcfdfeffUL
+            ||  i != 0xf8fafcfeUL
             ||  PACKET_remaining(&subpkt)
             ||  PACKET_get_sub_packet(pkt, &subpkt, 4)) {
         fprintf(stderr, "test_PACKET_get_sub_packet() failed\n");
@@ -194,13 +194,13 @@ static int test_PACKET_get_bytes(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_bytes(pkt, &bytes, 4)
-            ||  bytes[0] != 1 || bytes[1] != 2
-            ||  bytes[2] != 3 || bytes[3] != 4
+            ||  bytes[0] != 2 || bytes[1] != 4
+            ||  bytes[2] != 6 || bytes[3] != 8
             ||  PACKET_remaining(pkt) != BUF_LEN -4
             || !PACKET_forward(pkt, BUF_LEN - 8)
             || !PACKET_get_bytes(pkt, &bytes, 4)
-            ||  bytes[0] != 0xfc || bytes[1] != 0xfd
-            ||  bytes[2] != 0xfe || bytes[3] != 0xff
+            ||  bytes[0] != 0xf8 || bytes[1] != 0xfa
+            ||  bytes[2] != 0xfc || bytes[3] != 0xfe
             ||  PACKET_remaining(pkt)) {
         fprintf(stderr, "test_PACKET_get_bytes() failed\n");
         return 0;
@@ -215,13 +215,13 @@ static int test_PACKET_copy_bytes(PACKET *pkt, size_t start)
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_copy_bytes(pkt, bytes, 4)
-            ||  bytes[0] != 1 || bytes[1] != 2
-            ||  bytes[2] != 3 || bytes[3] != 4
+            ||  bytes[0] != 2 || bytes[1] != 4
+            ||  bytes[2] != 6 || bytes[3] != 8
             ||  PACKET_remaining(pkt) != BUF_LEN - 4
             || !PACKET_forward(pkt, BUF_LEN - 8)
             || !PACKET_copy_bytes(pkt, bytes, 4)
-            ||  bytes[0] != 0xfc || bytes[1] != 0xfd
-            ||  bytes[2] != 0xfe || bytes[3] != 0xff
+            ||  bytes[0] != 0xf8 || bytes[1] != 0xfa
+            ||  bytes[2] != 0xfc || bytes[3] != 0xfe
             ||  PACKET_remaining(pkt)) {
         fprintf(stderr, "test_PACKET_copy_bytes() failed\n");
         return 0;
@@ -239,16 +239,16 @@ static int test_PACKET_move_funcs(PACKET *pkt, size_t start)
             ||  PACKET_back(pkt, 1)
             || !PACKET_forward(pkt, 1)
             || !PACKET_get_bytes(pkt, &byte, 1)
-            ||  byte[0] != 2
+            ||  byte[0] != 4
             || !PACKET_get_bookmark(pkt, &bm)
             || !PACKET_forward(pkt, BUF_LEN - 2)
             ||  PACKET_forward(pkt, 1)
             || !PACKET_back(pkt, 1)
             || !PACKET_get_bytes(pkt, &byte, 1)
-            ||  byte[0] != 0xff
+            ||  byte[0] != 0xfe
             || !PACKET_goto_bookmark(pkt, bm)
             || !PACKET_get_bytes(pkt, &byte, 1)
-            ||  byte[0] != 3) {
+            ||  byte[0] != 6) {
         fprintf(stderr, "test_PACKET_move_funcs() failed\n");
         return 0;
     }
@@ -281,6 +281,85 @@ static int test_PACKET_buf_init()
     return 1;
 }
 
+static int test_PACKET_get_length_prefixed_1()
+{
+    unsigned char buf[BUF_LEN];
+    const size_t len = 16;
+    unsigned int i;
+    PACKET pkt, short_pkt, subpkt;
+
+    buf[0] = len;
+    for (i = 1; i < BUF_LEN; i++) {
+        buf[i] = (i * 2) & 0xff;
+    }
+
+    if (       !PACKET_buf_init(&pkt, buf, BUF_LEN)
+            || !PACKET_buf_init(&short_pkt, buf, len)
+            || !PACKET_get_length_prefixed_1(&pkt, &subpkt)
+            ||  PACKET_remaining(&subpkt) != len
+            || !PACKET_get_net_2(&subpkt, &i)
+            ||  i != 0x0204
+            ||  PACKET_get_length_prefixed_1(&short_pkt, &subpkt)
+            ||  PACKET_remaining(&short_pkt) != len) {
+        fprintf(stderr, "test_PACKET_get_length_prefixed_1() failed\n");
+        return 0;
+    }
+
+    return 1;
+}
+
+static int test_PACKET_get_length_prefixed_2()
+{
+    unsigned char buf[1024];
+    const size_t len = 516;  /* 0x0204 */
+    unsigned int i;
+    PACKET pkt, short_pkt, subpkt;
+
+    for (i = 1; i <= 1024; i++) {
+        buf[i-1] = (i * 2) & 0xff;
+    }
+
+    if (       !PACKET_buf_init(&pkt, buf, 1024)
+            || !PACKET_buf_init(&short_pkt, buf, len)
+            || !PACKET_get_length_prefixed_2(&pkt, &subpkt)
+            ||  PACKET_remaining(&subpkt) != len
+            || !PACKET_get_net_2(&subpkt, &i)
+            ||  i != 0x0608
+            ||  PACKET_get_length_prefixed_2(&short_pkt, &subpkt)
+            ||  PACKET_remaining(&short_pkt) != len) {
+        fprintf(stderr, "test_PACKET_get_length_prefixed_2() failed\n");
+        return 0;
+    }
+
+    return 1;
+}
+
+static int test_PACKET_get_length_prefixed_3()
+{
+    unsigned char buf[1024];
+    const size_t len = 516;  /* 0x000204 */
+    unsigned int i;
+    PACKET pkt, short_pkt, subpkt;
+
+    for (i = 0; i < 1024; i++) {
+        buf[i] = (i * 2) & 0xff;
+    }
+
+    if (       !PACKET_buf_init(&pkt, buf, 1024)
+            || !PACKET_buf_init(&short_pkt, buf, len)
+            || !PACKET_get_length_prefixed_3(&pkt, &subpkt)
+            ||  PACKET_remaining(&subpkt) != len
+            || !PACKET_get_net_2(&subpkt, &i)
+            ||  i != 0x0608
+            ||  PACKET_get_length_prefixed_3(&short_pkt, &subpkt)
+            ||  PACKET_remaining(&short_pkt) != len) {
+        fprintf(stderr, "test_PACKET_get_length_prefixed_3() failed\n");
+        return 0;
+    }
+
+    return 1;
+}
+
 int main(int argc, char **argv)
 {
     unsigned char buf[BUF_LEN];
@@ -289,7 +368,7 @@ int main(int argc, char **argv)
     PACKET pkt;
 
     for (i=1; i<=BUF_LEN; i++) {
-        buf[i-1] = i;
+        buf[i-1] = (i * 2) & 0xff;
     }
     i = 0;
 
@@ -309,7 +388,10 @@ int main(int argc, char **argv)
             || !test_PACKET_get_sub_packet(&pkt, start)
             || !test_PACKET_get_bytes(&pkt, start)
             || !test_PACKET_copy_bytes(&pkt, start)
-            || !test_PACKET_move_funcs(&pkt, start)) {
+            || !test_PACKET_move_funcs(&pkt, start)
+            || !test_PACKET_get_length_prefixed_1()
+            || !test_PACKET_get_length_prefixed_2()
+            || !test_PACKET_get_length_prefixed_3()) {
         return 1;
     }
     printf("PASS\n");
Unnamed repository; edit this file 'description' to name the repository.