X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/4f5e39ecfaa49376b0a5c3a4c384e91a828c1105..1fc8a4acb3ef658696038c9c4bd3c155fbc27ac3:/sha1.c

diff --git a/sha1.c b/sha1.c
index 87012f3..4cc63b5 100644
--- a/sha1.c
+++ b/sha1.c
@@ -2,6 +2,7 @@
 SHA-1 in C
 By Steve Reid <sreid@sea-to-sky.net>
 100% Public Domain
+[I interpet this as a blanket permision -iwj.]
 
 Note: parts of this file have been removed or modified to work in secnet.
 Instead of using this file in new projects, I suggest you use the
@@ -59,7 +60,9 @@ By Saul Kravitz <Saul.Kravitz@celera.com>
 Still 100% PD
 Modified to run on Compaq Alpha hardware.  
 
-
+-----------------
+(Further modifications as part of secnet.  See git history for full details.
+ - Ian Jackson et al)
 */
 
 /*
@@ -288,13 +291,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 +317,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 +332,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;