Set hash tests to auto calculate number of tests

diff --git a/t/md5.c b/t/md5.c
index 570e613b6f0702a9361917cd87743c31c2168f96..50876059597a1ddc5bba3013f496b00e2bfd7ce6 100644 (file)
--- a/t/md5.c
+++ b/t/md5.c
@@ -12,25 +12,6 @@
 #include "pduuid.h"
 #include "ctap.h"
 
-static int strbytes(char *s, unsigned char *d) {
-        unsigned int byte;
-        int i = 0;
-
-       if (!s) return 0;
-        if (*s == 0) return 0;
-
-       while (*s) {
-                if (*s == '-' || *s == ':') s++;
-
-                if (sscanf(s, "%02x", &byte) != 1) {
-                        return 0;
-                }
-                s += 2;
-                d[i++] = byte & 0xff;
-        }
-        return i;
-}
-
 void ufmt(pd_uuid_t *uuid, char *s) {
        int i;
        for (i=0;i<4;i++) {
@@ -65,6 +46,7 @@ int main(int ac, char *av[]) {
        unsigned char tmp[16];
        hash_state md;
        int i;
+       int n;
 
        static const struct {
                char *msg;
@@ -94,7 +76,9 @@ int main(int ac, char *av[]) {
     { NULL, { 0 } }
   };
 
-       plan(7);
+       for(n=0;tests[n].msg != NULL;n++);
+
+       plan(n);
 
        for (i = 0; tests[i].msg != NULL; i++) {
                md5_init(&md);

diff --git a/t/sha1.c b/t/sha1.c
index 86ba4122fbf04b776ffc159644afe07183d45f0d..4096552105ba2f414eed9c4bf48e1ad15e894450 100644 (file)
--- a/t/sha1.c
+++ b/t/sha1.c
@@ -18,33 +18,13 @@ static void bytestr(unsigned char *h, char *s, int len) {
        }
 }
 
-#if 0
-static int strbytes(char *s, unsigned char *d) {
-        unsigned int byte;
-        int i = 0;
-
-       if (!s) return 0;
-        if (*s == 0) return 0;
-
-       while (*s) {
-                if (*s == '-' || *s == ':' || *s == ' ') s++;
-
-                if (sscanf(s, "%02x", &byte) != 1) {
-                        return 0;
-                }
-                s += 2;
-                d[i++] = byte & 0xff;
-        }
-        return i;
-}
-#endif
-
 int main(int ac, char *av[]) {
        unsigned char tmp[20];
        hash_state md;
        int i, j;
        char want[64];
        char have[64];
+       int n;
 
        static struct {
                char *msg;
@@ -72,7 +52,9 @@ int main(int ac, char *av[]) {
     { NULL, 0, { 0 } }
   };
 
-       plan(8);
+       for (n=0;tests[n].msg != NULL; n++);
+
+       plan(2*n);
 
        for (i = 0; tests[i].msg != NULL; i++) {
                sha1_init(&md);