Adjust the configuration target name from Cygwin-i686 to Cygwin-x86

[openssl.git] / test / packettest.c

diff --git a/test/packettest.c b/test/packettest.c
index 19a7599353d031f7b8d90090c6db8c416fcdb242..ac360f59bdc6441b212b9ad89030513935746fc3 100644 (file)
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -240,6 +240,25 @@ static int test_PACKET_copy_bytes(unsigned char buf[BUF_LEN])
     return 1;
 }
 
+static int test_PACKET_copy_all(unsigned char buf[BUF_LEN])
+{
+    unsigned char tmp[BUF_LEN];
+    PACKET pkt;
+    size_t len;
+
+    if (       !PACKET_buf_init(&pkt, buf, BUF_LEN)
+               || !PACKET_copy_all(&pkt, tmp, BUF_LEN, &len)
+               || len != BUF_LEN
+               || memcmp(buf, tmp, BUF_LEN) != 0
+               || PACKET_remaining(&pkt) != BUF_LEN
+               || PACKET_copy_all(&pkt, tmp, BUF_LEN - 1, &len)) {
+        fprintf(stderr, "test_PACKET_copy_bytes() failed\n");
+        return 0;
+    }
+
+    return 1;
+}
+
 static int test_PACKET_memdup(unsigned char buf[BUF_LEN])
 {
     unsigned char *data = NULL;
@@ -253,11 +272,7 @@ static int test_PACKET_memdup(unsigned char buf[BUF_LEN])
             || !PACKET_forward(&pkt, 10)
             || !PACKET_memdup(&pkt, &data, &len)
             ||  len != BUF_LEN - 10
-            ||  memcmp(data, PACKET_data(&pkt), len)
-            || !PACKET_back(&pkt, 1)
-            || !PACKET_memdup(&pkt, &data, &len)
-            ||  len != BUF_LEN - 9
-               ||  memcmp(data, PACKET_data(&pkt), len)) {
+            ||  memcmp(data, PACKET_data(&pkt), len)) {
         fprintf(stderr, "test_PACKET_memdup() failed\n");
         OPENSSL_free(data);
         return 0;
@@ -294,22 +309,19 @@ static int test_PACKET_strndup()
     return 1;
 }
 
-static int test_PACKET_move_funcs(unsigned char buf[BUF_LEN])
+static int test_PACKET_forward(unsigned char buf[BUF_LEN])
 {
     unsigned char *byte;
     PACKET pkt;
 
     if (       !PACKET_buf_init(&pkt, buf, BUF_LEN)
-            ||  PACKET_back(&pkt, 1)
             || !PACKET_forward(&pkt, 1)
             || !PACKET_get_bytes(&pkt, &byte, 1)
             ||  byte[0] != 4
-            || !PACKET_forward(&pkt, BUF_LEN - 2)
-            ||  PACKET_forward(&pkt, 1)
-            || !PACKET_back(&pkt, 1)
+            || !PACKET_forward(&pkt, BUF_LEN - 3)
             || !PACKET_get_bytes(&pkt, &byte, 1)
             ||  byte[0] != 0xfe) {
-        fprintf(stderr, "test_PACKET_move_funcs() failed\n");
+        fprintf(stderr, "test_PACKET_forward() failed\n");
         return 0;
     }
 
@@ -319,20 +331,13 @@ static int test_PACKET_move_funcs(unsigned char buf[BUF_LEN])
 static int test_PACKET_buf_init()
 {
     unsigned char buf[BUF_LEN];
-    size_t len;
     PACKET pkt;
 
-    /* Also tests PACKET_get_len() */
+    /* Also tests PACKET_remaining() */
     if (       !PACKET_buf_init(&pkt, buf, 4)
-            || !PACKET_length(&pkt, &len)
-            ||  len != 4
+            ||  PACKET_remaining(&pkt) != 4
             || !PACKET_buf_init(&pkt, buf, BUF_LEN)
-            || !PACKET_length(&pkt, &len)
-            ||  len != BUF_LEN
-            ||  pkt.end - pkt.start != BUF_LEN
-            ||  pkt.end < pkt.start
-            ||  pkt.curr < pkt.start
-            ||  pkt.curr > pkt.end
+            ||  PACKET_remaining(&pkt) != BUF_LEN
             ||  PACKET_buf_init(&pkt, buf, -1)) {
         fprintf(stderr, "test_PACKET_buf_init() failed\n");
         return 0;
@@ -341,6 +346,39 @@ static int test_PACKET_buf_init()
     return 1;
 }
 
+static int test_PACKET_null_init()
+{
+    PACKET pkt;
+
+    PACKET_null_init(&pkt);
+    if (       PACKET_remaining(&pkt) != 0
+            || PACKET_forward(&pkt, 1)) {
+        fprintf(stderr, "test_PACKET_null_init() failed\n");
+        return 0;
+        }
+
+    return 1;
+}
+
+static int test_PACKET_equal(unsigned char buf[BUF_LEN])
+{
+    PACKET pkt;
+
+    if (       !PACKET_buf_init(&pkt, buf, 4)
+            || !PACKET_equal(&pkt, buf, 4)
+            ||  PACKET_equal(&pkt, buf + 1, 4)
+            || !PACKET_buf_init(&pkt, buf, BUF_LEN)
+            || !PACKET_equal(&pkt, buf, BUF_LEN)
+            ||  PACKET_equal(&pkt, buf, BUF_LEN - 1)
+            ||  PACKET_equal(&pkt, buf, BUF_LEN + 1)
+            ||  PACKET_equal(&pkt, buf, 0)) {
+        fprintf(stderr, "test_PACKET_equal() failed\n");
+        return 0;
+        }
+
+    return 1;
+}
+
 static int test_PACKET_get_length_prefixed_1()
 {
     unsigned char buf[BUF_LEN];
@@ -431,7 +469,9 @@ int main(int argc, char **argv)
     i = 0;
 
     if (       !test_PACKET_buf_init()
+            || !test_PACKET_null_init()
             || !test_PACKET_remaining(buf)
+            || !test_PACKET_equal(buf)
             || !test_PACKET_get_1(buf)
             || !test_PACKET_get_4(buf)
             || !test_PACKET_get_net_2(buf)
@@ -440,9 +480,10 @@ int main(int argc, char **argv)
             || !test_PACKET_get_sub_packet(buf)
             || !test_PACKET_get_bytes(buf)
             || !test_PACKET_copy_bytes(buf)
+            || !test_PACKET_copy_all(buf)
             || !test_PACKET_memdup(buf)
             || !test_PACKET_strndup()
-            || !test_PACKET_move_funcs(buf)
+            || !test_PACKET_forward(buf)
             || !test_PACKET_get_length_prefixed_1()
             || !test_PACKET_get_length_prefixed_2()
             || !test_PACKET_get_length_prefixed_3()) {