X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=md5.c;h=ca9ddb1ad7069b4850e59e96949c1db32f62efbf;hb=4d9d6e20e19c1aaa0d138e70897d136b36d673c0;hp=69158911eff29cf3540bcae36951e17736d27c27;hpb=b7886fd46ab05c97b8a072e497903622bd1d5290;p=secnet.git

diff --git a/md5.c b/md5.c
index 6915891..ca9ddb1 100644
--- a/md5.c
+++ b/md5.c
@@ -3,6 +3,7 @@
  * The algorithm is due to Ron Rivest.  This code was
  * written by Colin Plumb in 1993, no copyright is claimed.
  * This code is in the public domain; do with it what you wish.
+ * [I interpet this as a blanket permision -iwj.]
  *
  * Equivalent code is available from RSA Data Security, Inc.
  * This code has been tested against that, and is equivalent,
@@ -21,6 +22,7 @@
  */
 
 #include "secnet.h"
+#include "util.h"
 #include <string.h>		/* for memcpy() */
 #include "md5.h"
 
@@ -237,14 +239,11 @@ MD5Transform(uint32_t buf[4], uint32_t const in[16])
 
 #endif
 
-static void *md5_init(void)
+static void md5_init(void *sst)
 {
-    struct MD5Context *ctx;
+    struct MD5Context *ctx=sst;
 
-    NEW(ctx);
     MD5Init(ctx);
-
-    return ctx;
 }
 
 static void md5_update(void *sst, const void *buf, int32_t len)
@@ -259,7 +258,6 @@ static void md5_final(void *sst, uint8_t *digest)
     struct MD5Context *ctx=sst;
 
     MD5Final(digest,ctx);
-    free(ctx);
 }
 
 struct md5 {
@@ -270,7 +268,6 @@ struct md5 {
 void md5_module(dict_t *dict)
 {
     struct md5 *st;
-    void *ctx;
     cstring_t testinput="12345\n";
     uint8_t expected[16]=
 	{0xd5,0x77,0x27,0x3f,0xf8,0x85,0xc3,0xf8,
@@ -283,16 +280,15 @@ void md5_module(dict_t *dict)
     st->cl.type=CL_HASH;
     st->cl.apply=NULL;
     st->cl.interface=&st->ops;
-    st->ops.len=16;
+    st->ops.hlen=16;
+    st->ops.slen=sizeof(struct MD5Context);
     st->ops.init=md5_init;
     st->ops.update=md5_update;
     st->ops.final=md5_final;
 
     dict_add(dict,"md5",new_closure(&st->cl));
 
-    ctx=md5_init();
-    md5_update(ctx,testinput,strlen(testinput));
-    md5_final(ctx,digest);
+    hash_hash(&st->ops,testinput,strlen(testinput),digest);
     for (i=0; i<16; i++) {
 	if (digest[i]!=expected[i]) {
 	    fatal("md5 module failed self-test");