X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=sha1.c;h=0202ed3b30e86bf416281d5810631c991497d773;hb=b7886fd46ab05c97b8a072e497903622bd1d5290;hp=87012f33c8cda3c9ffca3b8652c1176af7fa4dad;hpb=4f5e39ecfaa49376b0a5c3a4c384e91a828c1105;p=secnet.git

diff --git a/sha1.c b/sha1.c
index 87012f3..0202ed3 100644
--- a/sha1.c
+++ b/sha1.c
@@ -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;