From 4b191ba09cf5de334bc42f00eac241fa679647c5 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 31 Dec 2014 21:40:47 -0600 Subject: [PATCH] remove duplicate md5 defs, check for Solaris -lmd5 --- configure.ac | 2 +- include/md5.h | 49 ------------------------------------------------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/configure.ac b/configure.ac index e41ee59..6c2c548 100644 --- a/configure.ac +++ b/configure.ac @@ -87,7 +87,7 @@ AC_SEARCH_LIBS([arc4random], [crypto]) AC_SEARCH_LIBS([clock_getres],[rt posix4]) AC_SEARCH_LIBS([clock_gettime],[rt posix4]) AC_SEARCH_LIBS([ibuf_open], [util]) -AC_SEARCH_LIBS([MD5Init], [md]) +AC_SEARCH_LIBS([MD5Init], [md md5]) AC_SEARCH_LIBS([SHA512Init], [md]) AC_CHECK_FUNCS([arc4random ibuf_open MD5Init SHA512Init]) diff --git a/include/md5.h b/include/md5.h index 10bbbd6..3e54015 100644 --- a/include/md5.h +++ b/include/md5.h @@ -8,52 +8,3 @@ #else #include "md5_openbsd.h" #endif -/* $OpenBSD: md5.h,v 1.16 2004/06/22 01:57:30 jfb Exp $ */ - -/* - * This code implements the MD5 message-digest algorithm. - * 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. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - */ - -#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 state[4]; /* state */ - u_int64_t count; /* number of bits, mod 2^64 */ - u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ -} MD5_CTX; - -__BEGIN_DECLS -void MD5Init(MD5_CTX *); -void MD5Update(MD5_CTX *, const u_int8_t *, size_t) - __attribute__((__bounded__(__string__,2,3))); -void MD5Pad(MD5_CTX *); -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,MD5_BLOCK_LENGTH))); -char *MD5End(MD5_CTX *, char *) - __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH))); -char *MD5File(const char *, char *) - __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH))); -char *MD5FileChunk(const char *, char *, off_t, off_t) - __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH))); -char *MD5Data(const u_int8_t *, size_t, char *) - __attribute__((__bounded__(__string__,1,2))) - __attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH))); -__END_DECLS - -#endif /* _MD5_H_ */