diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2004-04-28 16:52:09 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2004-04-28 16:52:09 +0000 |
| commit | 861f7626f7da706f339a901b351e4398597a383d (patch) | |
| tree | 080d7c26919321d0ed27d8f2929d5dcb1b722996 /include | |
| parent | df1bf813f00c77b21e3e8934986dad98c3d803e2 (diff) | |
Rename members of struct MD5Context to match other hash routines.
Add constants for buffer lengths and use them.
Make bit count 64bit based on changes by niklas@ long ago.
Conver htole32n() to macros and unroll loops.
Diffstat (limited to 'include')
| -rw-r--r-- | include/md5.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/include/md5.h b/include/md5.h index 36e94e5a750..533db75a421 100644 --- a/include/md5.h +++ b/include/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.12 2004/04/28 16:46:02 millert Exp $ */ +/* $OpenBSD: md5.h,v 1.13 2004/04/28 16:52:08 millert Exp $ */ /* * This code implements the MD5 message-digest algorithm. @@ -15,10 +15,14 @@ #ifndef _MD5_H_ #define _MD5_H_ +#define MD5_BLOCK_LENGTH 64 +#define MD5_DIGEST_LENGTH 16 +#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) + typedef struct MD5Context { - u_int32_t buf[4]; /* state */ - u_int32_t bits[2]; /* number of bits, mod 2^64 */ - unsigned char in[64]; /* input buffer */ + u_int32_t state[4]; /* state */ + u_int64_t count; /* number of bits, mod 2^64 */ + u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ } MD5_CTX; #include <sys/cdefs.h> @@ -27,18 +31,18 @@ __BEGIN_DECLS void MD5Init(MD5_CTX *); void MD5Update(MD5_CTX *, const u_int8_t *, size_t) __attribute__((__bounded__(__string__,2,3))); -void MD5Final(u_int8_t [16], MD5_CTX *) - __attribute__((__bounded__(__minbytes__,1,16))); -void MD5Transform(u_int32_t [4], const u_int8_t [64]) +void MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *) + __attribute__((__bounded__(__minbytes__,1,MD5_DIGEST_LENGTH))); +void MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]) __attribute__((__bounded__(__minbytes__,1,4))) - __attribute__((__bounded__(__minbytes__,2,64))); -char *MD5End(MD5_CTX *, char [33]) - __attribute__((__bounded__(__minbytes__,2,33))); -char *MD5File(char *, char [33]) - __attribute__((__bounded__(__minbytes__,2,33))); -char *MD5Data(const u_int8_t *, size_t, char [33]) + __attribute__((__bounded__(__minbytes__,2,MD5_BLOCK_LENGTH))); +char *MD5End(MD5_CTX *, char [MD5_DIGEST_STRING_LENGTH]) + __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH))); +char *MD5File(char *, char [MD5_DIGEST_STRING_LENGTH]) + __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH))); +char *MD5Data(const u_int8_t *, size_t, char [MD5_DIGEST_STRING_LENGTH]) __attribute__((__bounded__(__string__,1,2))) - __attribute__((__bounded__(__minbytes__,3,33))); + __attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH))); __END_DECLS #endif /* _MD5_H_ */ |