projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cleaning of generated files.
[u/mdw/catacomb]
/
md5.h
diff --git
a/md5.h
b/md5.h
index
8c54e6d
..
13b114e
100644
(file)
--- a/
md5.h
+++ b/
md5.h
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: md5.h,v 1.
1 1999/09/03 08:41:1
2 mdw Exp $
+ * $Id: md5.h,v 1.
3 2000/06/17 11:32:5
2 mdw Exp $
*
* The MD5 message digest function
*
*
* The MD5 message digest function
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: md5.h,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: md5.h,v $
+ * Revision 1.3 2000/06/17 11:32:52 mdw
+ * Change buffer offset to be unsigned.
+ *
+ * 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.
*
@@
-45,8
+51,8
@@
* applications. It's also still useful in constructions such as HMAC.
*/
* applications. It's also still useful in constructions such as HMAC.
*/
-#ifndef MD5_H
-#define MD5_H
+#ifndef
CATACOMB_
MD5_H
+#define
CATACOMB_
MD5_H
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-56,6
+62,10
@@
#include <mLib/bits.h>
#include <mLib/bits.h>
+#ifndef CATACOMB_GHASH_H
+# include "ghash.h"
+#endif
+
/*----- Magic numbers -----------------------------------------------------*/
#define MD5_BUFSZ 64
/*----- Magic numbers -----------------------------------------------------*/
#define MD5_BUFSZ 64
@@
-65,8
+75,8
@@
typedef struct md5_ctx {
uint32 a, b, c, d; /* Chaining variables */
typedef struct md5_ctx {
uint32 a, b, c, d; /* Chaining variables */
- u
nsigned long count;
/* Byte count so far */
-
int off;
/* Offset into buffer */
+ u
int32 nl, nh;
/* Byte count so far */
+
unsigned off;
/* Offset into buffer */
octet buf[MD5_BUFSZ]; /* Accumulation buffer */
} md5_ctx;
octet buf[MD5_BUFSZ]; /* Accumulation buffer */
} md5_ctx;
@@
-150,6
+160,10
@@
extern void md5_done(md5_ctx */*ctx*/, void */*hash*/);
extern unsigned long md5_state(md5_ctx */*ctx*/, void */*state*/);
extern unsigned long md5_state(md5_ctx */*ctx*/, void */*state*/);
+/*----- Generic hash interface --------------------------------------------*/
+
+extern const gchash md5;
+
/*----- That's all, folks -------------------------------------------------*/
#ifdef __cplusplus
/*----- That's all, folks -------------------------------------------------*/
#ifdef __cplusplus