projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new hash functions. Provide full help for subcommands. Run the
[u/mdw/catacomb]
/
md5.c
diff --git
a/md5.c
b/md5.c
index
c6e2a2a
..
fa078e9
100644
(file)
--- a/
md5.c
+++ b/
md5.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: md5.c,v 1.
1 1999/09/03 08:41:12
mdw Exp $
+ * $Id: md5.c,v 1.
3 2000/06/17 11:31:43
mdw Exp $
*
* The MD5 message digest function
*
*
* The MD5 message digest function
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: md5.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: md5.c,v $
+ * Revision 1.3 2000/06/17 11:31:43 mdw
+ * Portability fix for broken compilers.
+ *
+ * Revision 1.2 1999/12/10 23:20:03 mdw
+ * New hash interface requirements.
+ *
* Revision 1.1 1999/09/03 08:41:12 mdw
* Initial import.
*
* Revision 1.1 1999/09/03 08:41:12 mdw
* Initial import.
*
@@
-39,6
+45,8
@@
#include <mLib/bits.h>
#include <mLib/bits.h>
+#include "ghash.h"
+#include "ghash-def.h"
#include "hash.h"
#include "md5.h"
#include "hash.h"
#include "md5.h"
@@
-187,7
+195,7
@@
void md5_init(md5_ctx *ctx)
ctx->c = 0x98badcfe;
ctx->d = 0x10325476;
ctx->off = 0;
ctx->c = 0x98badcfe;
ctx->d = 0x10325476;
ctx->off = 0;
- ctx->
count
= 0;
+ ctx->
nl = ctx->nh
= 0;
}
/* --- @md5_set@ --- *
}
/* --- @md5_set@ --- *
@@
-211,7
+219,8
@@
void md5_set(md5_ctx *ctx, const void *buf, unsigned long count)
ctx->c = LOAD32_L(p + 8);
ctx->d = LOAD32_L(p + 12);
ctx->off = 0;
ctx->c = LOAD32_L(p + 8);
ctx->d = LOAD32_L(p + 12);
ctx->off = 0;
- ctx->count = count;
+ ctx->nl = U32(count);
+ ctx->nh = U32(((count & ~MASK32) >> 16) >> 16);
}
/* --- @md5_hash@ --- *
}
/* --- @md5_hash@ --- *
@@
-269,9
+278,13
@@
unsigned long md5_state(md5_ctx *ctx, void *state)
STORE32_L(p + 4, ctx->b);
STORE32_L(p + 8, ctx->c);
STORE32_L(p + 12, ctx->d);
STORE32_L(p + 4, ctx->b);
STORE32_L(p + 8, ctx->c);
STORE32_L(p + 12, ctx->d);
- return (ctx->
count
);
+ return (ctx->
nl | ((ctx->nh << 16) << 16)
);
}
}
+/* --- Generic interface --- */
+
+GHASH_DEF(MD5, md5)
+
/* --- Test code --- */
HASH_TEST(MD5, md5)
/* --- Test code --- */
HASH_TEST(MD5, md5)