X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=sha1.c;h=7b09f6efb48cbc0c4b99fbd2637e820f51e76ca3;hp=c378a9d5aa80082b4ff438e7a95ac288b7850a8b;hb=59938e0ed0c8ac267c3715a25a0a3ed27f7a7e47;hpb=3454dce4c6909648b711a59b57c5a527036b2a8e

diff --git a/sha1.c b/sha1.c
index c378a9d..7b09f6e 100644
--- a/sha1.c
+++ b/sha1.c
@@ -97,9 +97,9 @@ typedef unsigned long int uint32;
 #endif /* 0 */
 
 /* Get types and defines from the secnet configuration */
-typedef int64_t int64;
+/* typedef int64_t int64; */
 typedef uint64_t uint64;
-typedef int32_t int32;
+/* typedef int32_t int32; */
 typedef uint32_t uint32;
 
 /* #include <process.h> */	/* prototype for exit() - JHB */
@@ -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");
 	}
     }
 }