udp: Insist on only one successful default socket setup

[secnet.git] / sha1.c

diff --git a/sha1.c b/sha1.c
index c378a9d5aa80082b4ff438e7a95ac288b7850a8b..0202ed3b30e86bf416281d5810631c991497d773 100644 (file)
--- 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 */
@@ -288,13 +288,13 @@ static void *sha1_init(void)
 {
     SHA1_CTX *ctx;
 
-    ctx=safe_malloc(sizeof(*ctx),"sha1_init");
+    NEW(ctx);
     SHA1Init(ctx);
 
     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,
@@ -330,7 +329,7 @@ void sha1_module(dict_t *dict)
     uint8_t digest[20];
     int i;
 
-    st=safe_malloc(sizeof(*st),"sha1_module");
+    NEW(st);
     st->cl.description="sha1";
     st->cl.type=CL_HASH;
     st->cl.apply=NULL;
@@ -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");
        }
     }
 }