update changelog

[debian/iodine.git] / tests / read.c

diff --git a/tests/read.c b/tests/read.c
index e0e447294560e9b027bc42ecf1017077c71bc758..18cc29ce9b4ce9fe3fe253dfab88e620da755903 100644 (file)
--- a/tests/read.c
+++ b/tests/read.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2006 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
+ * Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -33,7 +33,7 @@
 #include "dns.h"
 #include "read.h"
 #include "test.h"
 #include "dns.h"
 #include "read.h"
 #include "test.h"

-       
+

 START_TEST(test_read_putshort)
 {
        unsigned short k;
 START_TEST(test_read_putshort)
 {
        unsigned short k;


@@ -44,15 +44,15 @@ START_TEST(test_read_putshort)
        for (i = 0; i < 65536; i++) {
                p = (char*)&k;
                putshort(&p, i);
        for (i = 0; i < 65536; i++) {
                p = (char*)&k;
                putshort(&p, i);

-               fail_unless(ntohs(k) == i, 
-                               va_str("Bad value on putshort for %d: %d != %d", 
-                                       i, ntohs(k), i));
+               fail_unless(ntohs(k) == i,
+                               "Bad value on putshort for %d: %d != %d",
+                                       i, ntohs(k), i);

 
                p = (char*)&k;
                readshort(NULL, &p, (short *) &l);
                fail_unless(l == i,
 
                p = (char*)&k;
                readshort(NULL, &p, (short *) &l);
                fail_unless(l == i,

-                               va_str("Bad value on readshort for %d: %d != %d", 
-                                       i, l, i));
+                               "Bad value on readshort for %d: %d != %d",
+                                       i, l, i);

        }
 }
 END_TEST
        }
 }
 END_TEST


@@ -71,27 +71,55 @@ START_TEST(test_read_putlong)
 
                putlong(&p, j);
 
 
                putlong(&p, j);
 

-               fail_unless(ntohl(k) == j, 
-                               va_str("Bad value on putlong for %d: %d != %d", i, ntohl(j), j));
-               
+               fail_unless(ntohl(k) == j,
+                               "Bad value on putlong for %d: %d != %d", i, ntohl(j), j);
+

                p = (char*)&k;
                readlong(NULL, &p, &l);
 
                fail_unless(l == j,
                p = (char*)&k;
                readlong(NULL, &p, &l);
 
                fail_unless(l == j,

-                               va_str("Bad value on readlong for %d: %d != %d", i, l, j));
+                               "Bad value on readlong for %d: %d != %d", i, l, j);

        }
 }
 END_TEST
 
        }
 }
 END_TEST
 

-START_TEST(test_read_name)
+START_TEST(test_read_name_empty_loop)

 {
        unsigned char emptyloop[] = {
                'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 {
        unsigned char emptyloop[] = {
                'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-               0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 }; 
+               0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 };
+       char buf[1024];
+       char *data;
+       int rv;
+
+       memset(buf, 0, sizeof(buf));
+       data = (char*) emptyloop + sizeof(HEADER);
+       buf[1023] = 'A';
+       rv = readname((char *) emptyloop, sizeof(emptyloop), &data, buf, 1023);
+       fail_unless(buf[1023] == 'A');
+}
+END_TEST
+
+START_TEST(test_read_name_inf_loop)
+{

        unsigned char infloop[] = {
                'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        unsigned char infloop[] = {
                'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-               0x01, 'A', 0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 }; 
-       unsigned char longname[] = 
+               0x01, 'A', 0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 };
+       char buf[1024];
+       char *data;
+       int rv;
+
+       memset(buf, 0, sizeof(buf));
+       data = (char*) infloop + sizeof(HEADER);
+       buf[4] = '\a';
+       rv = readname((char*) infloop, sizeof(infloop), &data, buf, 4);
+       fail_unless(buf[4] == '\a');
+}
+END_TEST
+
+START_TEST(test_read_name_longname)
+{
+       unsigned char longname[] =

                "AA\x81\x80\x00\x01\x00\x00\x00\x00\x00\x00"
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "AA\x81\x80\x00\x01\x00\x00\x00\x00\x00\x00"
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"


@@ -100,44 +128,45 @@ START_TEST(test_read_name)
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "\x00\x00\x01\x00\x01";
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA"
                "\x00\x00\x01\x00\x01";

-       unsigned char onejump[] = 
-               "AA\x81\x80\x00\x01\x00\x00\x00\x00\x00\x00"
-               "\x02hh\xc0\x15\x00\x01\x00\x01\x05zBCDE\x00";
-       unsigned char badjump[] = {
-               'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 }; 
-       unsigned char badjump2[] = {
-               'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x02, 'B', 'A', 0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 }; 
-       unsigned char *jumper;

        char buf[1024];
        char *data;
        int rv;
 
        char buf[1024];
        char *data;
        int rv;
 

-       memset(buf, 0, sizeof(buf));
-       data = (char*) emptyloop + sizeof(HEADER);
-       buf[1023] = 'A';
-       rv = readname((char *) emptyloop, sizeof(emptyloop), &data, buf, 1023);
-       fail_unless(buf[1023] == 'A', NULL);
-       
-       memset(buf, 0, sizeof(buf));
-       data = (char*) infloop + sizeof(HEADER);
-       buf[4] = '\a';
-       rv = readname((char*) infloop, sizeof(infloop), &data, buf, 4);
-       fail_unless(buf[4] == '\a', NULL);
-       

        memset(buf, 0, sizeof(buf));
        data = (char*) longname + sizeof(HEADER);
        buf[256] = '\a';
        rv = readname((char*) longname, sizeof(longname), &data, buf, 256);
        memset(buf, 0, sizeof(buf));
        data = (char*) longname + sizeof(HEADER);
        buf[256] = '\a';
        rv = readname((char*) longname, sizeof(longname), &data, buf, 256);

-       fail_unless(buf[256] == '\a', NULL);
+       fail_unless(buf[256] == '\a');
+}
+END_TEST
+
+START_TEST(test_read_name_onejump)
+{
+       unsigned char onejump[] =
+               "AA\x81\x80\x00\x01\x00\x00\x00\x00\x00\x00"
+               "\x02hh\xc0\x15\x00\x01\x00\x01\x05zBCDE\x00";
+       char buf[1024];
+       char *data;
+       int rv;

 
        memset(buf, 0, sizeof(buf));
        data = (char*) onejump + sizeof(HEADER);
        rv = readname((char*) onejump, sizeof(onejump), &data, buf, 256);
 
        memset(buf, 0, sizeof(buf));
        data = (char*) onejump + sizeof(HEADER);
        rv = readname((char*) onejump, sizeof(onejump), &data, buf, 256);

-       fail_unless(rv == 9, NULL);
-       
-       /* These two tests use malloc to cause segfault if jump is executed */
+       fail_unless(rv == 9);
+}
+END_TEST
+
+START_TEST(test_read_name_badjump_start)
+{
+       unsigned char badjump[] = {
+               'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+               0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 };
+       unsigned char *jumper;
+       char buf[1024];
+       char *data;
+       int rv;
+
+       /* This test uses malloc to cause segfault if jump is executed */

        memset(buf, 0, sizeof(buf));
        jumper = malloc(sizeof(badjump));
        if (jumper) {
        memset(buf, 0, sizeof(buf));
        jumper = malloc(sizeof(badjump));
        if (jumper) {


@@ -145,11 +174,24 @@ START_TEST(test_read_name)
                data = (char*) jumper + sizeof(HEADER);
                rv = readname((char*) jumper, sizeof(badjump), &data, buf, 256);
 
                data = (char*) jumper + sizeof(HEADER);
                rv = readname((char*) jumper, sizeof(badjump), &data, buf, 256);
 

-               fail_unless(rv == 0, NULL);
-               fail_unless(buf[0] == 0, NULL);
+               fail_unless(rv == 0);
+               fail_unless(buf[0] == 0);

        }
        free(jumper);
        }
        free(jumper);

-       
+}
+END_TEST
+
+START_TEST(test_read_name_badjump_second)
+{
+       unsigned char badjump2[] = {
+               'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+               0x02, 'B', 'A', 0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 };
+       unsigned char *jumper;
+       char buf[1024];
+       char *data;
+       int rv;
+
+       /* This test uses malloc to cause segfault if jump is executed */

        memset(buf, 0, sizeof(buf));
        jumper = malloc(sizeof(badjump2));
        if (jumper) {
        memset(buf, 0, sizeof(buf));
        jumper = malloc(sizeof(badjump2));
        if (jumper) {


@@ -157,9 +199,9 @@ START_TEST(test_read_name)
                data = (char*) jumper + sizeof(HEADER);
                rv = readname((char*) jumper, sizeof(badjump2), &data, buf, 256);
 
                data = (char*) jumper + sizeof(HEADER);
                rv = readname((char*) jumper, sizeof(badjump2), &data, buf, 256);
 

-               fail_unless(rv == 4, NULL);
-               fail_unless(strcmp("BA.", buf) == 0, 
-                               va_str("buf is not BA: %s", buf));
+               fail_unless(rv == 4);
+               fail_unless(strcmp("BA.", buf) == 0,
+                               "buf is not BA: %s", buf);

        }
        free(jumper);
 }
        }
        free(jumper);
 }


@@ -180,15 +222,15 @@ START_TEST(test_putname)
        b = buf;
        ret = putname(&b, 256, domain);
 
        b = buf;
        ret = putname(&b, 256, domain);
 

-       fail_unless(ret == strlen(domain) + 1, NULL);
+       fail_unless(ret == strlen(domain) + 1);

        fail_unless(strncmp(buf, out, ret) == 0, "Happy flow failed");
 }
 END_TEST
        fail_unless(strncmp(buf, out, ret) == 0, "Happy flow failed");
 }
 END_TEST

-       
+

 START_TEST(test_putname_nodot)
 {
        char buf[256];
 START_TEST(test_putname_nodot)
 {
        char buf[256];

-       char *nodot = 
+       char *nodot =

                "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
                "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ";
        char *b;
                "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
                "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ";
        char *b;


@@ -201,15 +243,15 @@ START_TEST(test_putname_nodot)
        b = buf;
        ret = putname(&b, 256, nodot);
 
        b = buf;
        ret = putname(&b, 256, nodot);
 

-       fail_unless(ret == -1, NULL);
-       fail_unless(b == buf, NULL);
+       fail_unless(ret == -1);
+       fail_unless(b == buf);

 }
 END_TEST
 }
 END_TEST

-       
+

 START_TEST(test_putname_toolong)
 {
        char buf[256];
 START_TEST(test_putname_toolong)
 {
        char buf[256];

-       char *toolong = 
+       char *toolong =

                "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
                "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
                "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
                "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
                "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
                "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."


@@ -226,8 +268,8 @@ START_TEST(test_putname_toolong)
        b = buf;
        ret = putname(&b, 256, toolong);
 
        b = buf;
        ret = putname(&b, 256, toolong);
 

-       fail_unless(ret == -1, NULL);
-       fail_unless(b == buf, NULL);
+       fail_unless(ret == -1);
+       fail_unless(b == buf);

 }
 END_TEST
 
 }
 END_TEST
 


@@ -241,7 +283,12 @@ test_read_create_tests()
        tcase_set_timeout(tc, 60);
        tcase_add_test(tc, test_read_putshort);
        tcase_add_test(tc, test_read_putlong);
        tcase_set_timeout(tc, 60);
        tcase_add_test(tc, test_read_putshort);
        tcase_add_test(tc, test_read_putlong);

-       tcase_add_test(tc, test_read_name);
+       tcase_add_test(tc, test_read_name_empty_loop);
+       tcase_add_test(tc, test_read_name_inf_loop);
+       tcase_add_test(tc, test_read_name_longname);
+       tcase_add_test(tc, test_read_name_onejump);
+       tcase_add_test(tc, test_read_name_badjump_start);
+       tcase_add_test(tc, test_read_name_badjump_second);

        tcase_add_test(tc, test_putname);
        tcase_add_test(tc, test_putname_nodot);
        tcase_add_test(tc, test_putname_toolong);
        tcase_add_test(tc, test_putname);
        tcase_add_test(tc, test_putname_nodot);
        tcase_add_test(tc, test_putname_toolong);