Work around Bison's crazy redeclaration of malloc/free.

[secnet.git] / sha1.c

diff --git a/sha1.c b/sha1.c
index d85e0a83975f15f9089bf02d7081c57d48ddb68a..a0f26e8be6facdadfed882d1cf4dd65fd6da9523 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -294,7 +294,7 @@ static void *sha1_init(void)
     return ctx;
 }
 
-static void sha1_update(void *sst, uint8_t const *buf, uint32_t len)
+static void sha1_update(void *sst, const void *buf, int32_t len)
 {
     SHA1_CTX *ctx=sst;
 
@@ -314,12 +314,11 @@ struct sha1 {
     struct hash_if ops;
 };
 
-init_module sha1_module;
 void sha1_module(dict_t *dict)
 {
     struct sha1 *st;
     void *ctx;
-    string_t testinput="abcdbcdecdefdefgefghfghigh"
+    cstring_t testinput="abcdbcdecdefdefgefghfghigh"
        "ijhijkijkljklmklmnlmnomnopnopq";
     uint8_t expected[20]=
     { 0x84,0x98,0x3e,0x44,
@@ -347,7 +346,7 @@ void sha1_module(dict_t *dict)
     sha1_final(ctx,digest);
     for (i=0; i<20; i++) {
        if (digest[i]!=expected[i]) {
-           fatal("sha1 module failed self-test\n");
+           fatal("sha1 module failed self-test");
        }
     }
 }