X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=tests%2Ftest-sha1.c;h=b7279db6aaa4594b0a4a3c4be46dd68440426958;hb=d0a46cb4608e632f5028034762f0adde2ce947a0;hp=65751c85ccf05ccbb636376f595b807b267d2099;hpb=34e63086edddcae06d7c1a4fa84fec0861e50758;p=cascardo%2Fovs.git

diff --git a/tests/test-sha1.c b/tests/test-sha1.c
index 65751c85c..b7279db6a 100644
--- a/tests/test-sha1.c
+++ b/tests/test-sha1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,17 @@
  */
 
 #include <config.h>
+#undef NDEBUG
 #include "sha1.h"
+#include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "ovstest.h"
 #include "random.h"
 #include "util.h"
 
-#undef NDEBUG
-#include <assert.h>
-
 struct test_vector {
     char *data;
     size_t size;
@@ -108,8 +108,8 @@ test_one(const struct test_vector *vec)
         struct sha1_ctx sha1;
 
         sha1_init(&sha1);
-        sha1_update(&sha1, (const void *) vec->data, n0);
-        sha1_update(&sha1, (const void *) (vec->data + n0), n1);
+        sha1_update(&sha1, vec->data, n0);
+        sha1_update(&sha1, vec->data + n0, n1);
         sha1_final(&sha1, md);
         assert(!memcmp(md, vec->output, SHA1_DIGEST_SIZE));
     }
@@ -127,15 +127,18 @@ test_big_vector(void)
         { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
           0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
     };
+    size_t i;
 
     vec.data = xmalloc(SIZE);
-    memset(vec.data, 'a', SIZE);
+    for (i = 0; i < SIZE; i++) {
+        vec.data[i] = 'a';
+    }
     test_one(&vec);
     free(vec.data);
 }
 
-int
-main(void)
+static void
+test_shar1_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 {
     int i;
 
@@ -146,6 +149,6 @@ main(void)
     test_big_vector();
 
     putchar('\n');
-
-    return 0;
 }
+
+OVSTEST_REGISTER("test-sha1", test_shar1_main);