Index: cvs2svn/branches/unlabeled-1.2.6/sys/sys/md5.h =================================================================== --- cvs2svn/branches/unlabeled-1.2.6/sys/sys/md5.h (revision 10586) +++ cvs2svn/branches/unlabeled-1.2.6/sys/sys/md5.h (revision 10587) @@ -1,42 +1,42 @@ /* MD5.H - header file for MD5C.C * $FreeBSD$ */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ #ifndef _MD5_H_ #define _MD5_H_ /* MD5 context. */ typedef struct { unsigned long state[4]; /* state (ABCD) */ unsigned long count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD5_CTX; void MD5Init (MD5_CTX *); void MD5Update (MD5_CTX *, const unsigned char *, unsigned int); void MD5Final (unsigned char [16], MD5_CTX *); -char * MD5End(MD5_CTX *); -char * MD5File(char *); -char * MD5Data(const unsigned char *, unsigned int); +char * MD5End(MD5_CTX *, char *); +char * MD5File(char *, char *); +char * MD5Data(const unsigned char *, unsigned int, char *); #endif /* _MD5_H_ */ Index: stable/2.1/lib/libmd/Makefile =================================================================== --- stable/2.1/lib/libmd/Makefile (revision 10586) +++ stable/2.1/lib/libmd/Makefile (revision 10587) @@ -1,96 +1,100 @@ # $FreeBSD$ LIB= md NOPIC= true SRCS= md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c -MAN3+= mdX.3 -MLINKS+=mdX.3 MD2Init.3 mdX.3 MD2Update.3 mdX.3 MD2Final.3 -MLINKS+=mdX.3 MD2End.3 mdX.3 MD2File.3 mdX.3 MD2Data.3 -MLINKS+=mdX.3 MD4Init.3 mdX.3 MD4Update.3 mdX.3 MD4Final.3 -MLINKS+=mdX.3 MD4End.3 mdX.3 MD4File.3 mdX.3 MD4Data.3 -MLINKS+=mdX.3 MD5Init.3 mdX.3 MD5Update.3 mdX.3 MD5Final.3 -MLINKS+=mdX.3 MD5End.3 mdX.3 MD5File.3 mdX.3 MD5Data.3 +.if exists(obj) +MAN3+= obj/md2.3 obj/md4.3 obj/md5.3 +.else +MAN3+= md2.3 md4.3 md5.3 +.endif +MLINKS+=md2.3 MD2Init.3 md2.3 MD2Update.3 md2.3 MD2Final.3 +MLINKS+=md2.3 MD2End.3 md2.3 MD2File.3 md2.3 MD2Data.3 +MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3 +MLINKS+=md4.3 MD4End.3 md4.3 MD4File.3 md4.3 MD4Data.3 +MLINKS+=md5.3 MD5Init.3 md5.3 MD5Update.3 md5.3 MD5Final.3 +MLINKS+=md5.3 MD5End.3 md5.3 MD5File.3 md5.3 MD5Data.3 CLEANFILES+= md[245]hl.c md[245].ref md[245].3 mddriver CFLAGS+= -I${.CURDIR} all: md2.3 md4.3 md5.3 md2hl.c: mdXhl.c sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' $> > $@ md4hl.c: mdXhl.c sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' $> > $@ md5hl.c: mdXhl.c sed -e 's/mdX/md5/g' -e 's/MDX/MD5/g' $> > $@ md2.3: ${.CURDIR}/mdX.3 sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' $> > $@ cat ${.CURDIR}/md2.copyright >> $@ md4.3: ${.CURDIR}/mdX.3 sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' $> > $@ cat ${.CURDIR}/md4.copyright >> $@ md5.3: ${.CURDIR}/mdX.3 sed -e 's/mdX/md5/g' -e 's/MDX/MD5/g' $> > $@ cat ${.CURDIR}/md5.copyright >> $@ md2.ref: echo 'MD2 test suite:' > $@ @echo 'MD2 ("") = 8350e5a3e24c153df2275c9f80692773' >> $@ @echo 'MD2 ("a") = 32ec01ec4a6dac72c0ab96fb34c0b5d1' >> $@ @echo 'MD2 ("abc") = da853b0d3f88d99b30283a69e6ded6bb' >> $@ @echo 'MD2 ("message digest") = ab4f496bfb2a530b219ff33031fe06b0' >> $@ @echo 'MD2 ("abcdefghijklmnopqrstuvwxyz") = 4e8ddff3650292ab5a4108c3aa47940b' >> $@ @echo 'MD2 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = da33def2a42df13975352846c30338cd' >> $@ @echo 'MD2 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = d5976f79d83d3a0dc9806c3c66f3efd8' >> $@ md4.ref: echo 'MD4 test suite:' > $@ @echo 'MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0' >> $@ @echo 'MD4 ("a") = bde52cb31de33e46245e05fbdbd6fb24' >> $@ @echo 'MD4 ("abc") = a448017aaf21d8525fc10ae87aa6729d' >> $@ @echo 'MD4 ("message digest") = d9130a8164549fe818874806e1c7014b' >> $@ @echo 'MD4 ("abcdefghijklmnopqrstuvwxyz") = d79e1c308aa5bbcdeea8ed63df412da9' >> $@ @echo 'MD4 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = 043f8582f241db351ce627e153e7f0e4' >> $@ @echo 'MD4 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = e33b4ddc9c38f2199c3e7b164fcc0536' >> $@ md5.ref: echo 'MD5 test suite:' > $@ @echo 'MD5 ("") = d41d8cd98f00b204e9800998ecf8427e' >> $@ @echo 'MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661' >> $@ @echo 'MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72' >> $@ @echo 'MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0' >> $@ @echo 'MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b' >> $@ @echo 'MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = d174ab98d277d9f5a5611c2c9f419d9f' >> $@ @echo 'MD5 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = 57edf4a22be3c955ac49da2e2107b67a' >> $@ test: md2.ref md4.ref md5.ref @${ECHO} if any of these test fail, the code produces wrong results @${ECHO} and should NOT be used. ${CC} -static ${CFLAGS} ${LDFLAGS} -DMD=2 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd ./mddriver | cmp md2.ref - @${ECHO} MD2 passed test ${CC} -static ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd ./mddriver | cmp md4.ref - @${ECHO} MD4 passed test ${CC} -static ${CFLAGS} ${LDFLAGS} -DMD=5 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd ./mddriver | cmp md5.ref - @${ECHO} MD5 passed test -rm -f mddriver beforedepend: md2hl.c md4hl.c md5hl.c beforeinstall: -cd ${.CURDIR}; cmp -s md2.h ${DESTDIR}/usr/include/md2.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 md2.h \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 md2.h \ ${DESTDIR}/usr/include -cd ${.CURDIR}; cmp -s md4.h ${DESTDIR}/usr/include/md4.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 md4.h \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 md4.h \ ${DESTDIR}/usr/include -cd ${.CURDIR}; cmp -s md5.h ${DESTDIR}/usr/include/md5.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 md5.h \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 md5.h \ ${DESTDIR}/usr/include .include Index: stable/2.1/lib/libmd/md2.h =================================================================== --- stable/2.1/lib/libmd/md2.h (revision 10586) +++ stable/2.1/lib/libmd/md2.h (revision 10587) @@ -1,40 +1,40 @@ /* MD2.H - header file for MD2C.C * $FreeBSD$ */ /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights reserved. License to copy and use this software is granted for non-commercial Internet Privacy-Enhanced Mail provided that it is identified as the "RSA Data Security, Inc. MD2 Message Digest Algorithm" in all material mentioning or referencing this software or this function. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ #ifndef _MD2_H_ #define _MD2_H_ typedef struct { unsigned char state[16]; /* state */ unsigned char checksum[16]; /* checksum */ unsigned int count; /* number of bytes, modulo 16 */ unsigned char buffer[16]; /* input buffer */ } MD2_CTX; void MD2Init(MD2_CTX *); void MD2Update(MD2_CTX *, const unsigned char *, unsigned int); void MD2Final(unsigned char [16], MD2_CTX *); -char * MD2End(MD2_CTX *); -char * MD2File(char *); -char * MD2Data(const unsigned char *, unsigned int); +char * MD2End(MD2_CTX *, char *); +char * MD2File(char *, char *); +char * MD2Data(const unsigned char *, unsigned int, char *); #endif /* _MD2_H_ */ Index: stable/2.1/lib/libmd/md4.h =================================================================== --- stable/2.1/lib/libmd/md4.h (revision 10586) +++ stable/2.1/lib/libmd/md4.h (revision 10587) @@ -1,42 +1,42 @@ /* MD4.H - header file for MD4C.C * $FreeBSD$ */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD4 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD4 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ #ifndef _MD4_H_ #define _MD4_H_ /* MD4 context. */ typedef struct { unsigned long state[4]; /* state (ABCD) */ unsigned long count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD4_CTX; void MD4Init(MD4_CTX *); void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); void MD4Final(unsigned char [16], MD4_CTX *); -char * MD4End(MD4_CTX *); -char * MD4File(char *); -char * MD4Data(const unsigned char *, unsigned int); +char * MD4End(MD4_CTX *, char *); +char * MD4File(char *, char *); +char * MD4Data(const unsigned char *, unsigned int, char *); #endif /* _MD4_H_ */ Index: stable/2.1/lib/libmd/md5.h =================================================================== --- stable/2.1/lib/libmd/md5.h (revision 10586) +++ stable/2.1/lib/libmd/md5.h (revision 10587) @@ -1,42 +1,42 @@ /* MD5.H - header file for MD5C.C * $FreeBSD$ */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ #ifndef _MD5_H_ #define _MD5_H_ /* MD5 context. */ typedef struct { unsigned long state[4]; /* state (ABCD) */ unsigned long count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD5_CTX; void MD5Init (MD5_CTX *); void MD5Update (MD5_CTX *, const unsigned char *, unsigned int); void MD5Final (unsigned char [16], MD5_CTX *); -char * MD5End(MD5_CTX *); -char * MD5File(char *); -char * MD5Data(const unsigned char *, unsigned int); +char * MD5End(MD5_CTX *, char *); +char * MD5File(char *, char *); +char * MD5Data(const unsigned char *, unsigned int, char *); #endif /* _MD5_H_ */ Index: stable/2.1/lib/libmd/mdX.3 =================================================================== --- stable/2.1/lib/libmd/mdX.3 (revision 10586) +++ stable/2.1/lib/libmd/mdX.3 (revision 10587) @@ -1,116 +1,125 @@ .\" .\" ---------------------------------------------------------------------------- .\" "THE BEER-WARE LICENSE" (Revision 42): .\" wrote this file. As long as you retain this notice you .\" can do whatever you want with this stuff. If we meet some day, and you think .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" .\" $FreeBSD$ .\" .Dd July 14, 1994 .Dt MDX 3 .Os FreeBSD 2 .Sh NAME .Nm MDXInit , .Nm MDXUpdate , .Nm MDXFinal , .Nm MDXEnd , .Nm MDXFile , .Nm MDXData . .Nd calculate ``MDX'' cryptographic checksum .Sh SYNOPSIS .Fd #include .Ft void .Fn MDXInit "MDX_CTX *context" .Ft void .Fn MDXUpdate "MDX_CTX *context" "unsigned char *data" "unsigned int len" .Ft void .Fn MDXFinal "unsigned char digest[16]" "MDX_CTX *context" .Ft "char *" -.Fn MDXEnd "MDX_CTX *context" +.Fn MDXEnd "MDX_CTX *context" "char *buf" .Ft "char *" -.Fn MDXFile "char *filename" +.Fn MDXFile "char *filename" "char *buf" .Ft "char *" -.Fn MDXData "unsigned char *data" "unsigned int len" +.Fn MDXData "unsigned char *data" "unsigned int len" "char *buf" .Sh DESCRIPTION The MDX functions calculate a 128-bit cryptographic checksum (digest) for any number of input bytes. A cryptographic checksum is a one-way hash-function, that is, you cannot find (except by exhaustive search) the input corresponding to a particular output. This net result is a ``fingerprint'' of the input-data, which doesn't disclose the actual input. MD2 is the slowest, MD4 is the fastest and MD5 is somewhere in the middle. MD2 can only be used for Privacy-Enhanced Mail. MD4 has been critizised for being to weak, and MD5 was developed as a response to this as ``MD4 with safety-belts''. If in doubt, use MD5. The .Fn MDXInit , .Fn MDXUpdate and .Fn MDXFinal functions are the core functions. Allocate a MDX_CTX, initialize it with .Fn MDXInit run over the data with .Fn MDXUpdate and finally extract the result using .Fn MDXFinal . .Fn MDXEnd -is identical to +is a wrapper for .Fn MDXFinal , -except the return is in ASCII-HEX in a -string allocated with -.Xr malloc 3 . +which converts the return value to a 33 character (incl terminating NULL) +ascii string which represents the 128 bits in hexadecimal. .Fn MDXFile -calculates the digest of a file, and returns the ASCII-HEX result. +calculates the digest of a file, and uses +.Fn MDXFinal +to return the result. In case the file cannot be opened, NULL is returned. .Fn MDXData -calculates the digest of a chunk of data in memory, and returns the ASCII-HEX -result. +calculates the digest of a chunk of data in memory, and uses +.Fn MDXFinal +to return the result. When using .Fn MDXEnd , .Fn MDXFile -and +or .Fn MDXData , -the returned string must be explicitly deallocated using +the +.Ar buf +argument can be NULL, in which case the returned string is allocated with +.Xr malloc 3 +and subsequently must be explicitly deallocated using .Xr free 3 after use. +If the +.Ar buf +argument isn't NULL it must point to at least 33 characters of buffer space. .Sh SEE ALSO .Xr md2 3 , .Xr md4 3 , .Xr md5 3 .Pp ISOC Internet Request For Comments .%T RFC1319 , .%T RFC1320 and .%T RFC1321 . .Pp RSA Laboratories .%T Frequently Asked Questions About today's Cryptography . .Sh AUTHOR The MD2, MD4 and MD5 is designed and written by Ron Rivest and published in the above RFC's, including a reference implementation of each algorithm. This code is derived directly from these implementations by Poul-Henning Kamp Phk ristede runen. .Sh HISTORY These functions appeared in .Em FreeBSD-2.0 .Sh BUGS No method is known to exist which finds two files having the same hash value, nor to find a file with a specific hash value. There is on the other hand no guarantee that such a method doesn't exist. -MD2 can only be used for Privacy Enhanced Mail. +MD2 has only been released for use in Privacy Enhanced eMail. Use MD4 or MD5 if that isn't what you're doing. .Sh COPYRIGHT Index: stable/2.1/lib/libmd/mdXhl.c =================================================================== --- stable/2.1/lib/libmd/mdXhl.c (revision 10586) +++ stable/2.1/lib/libmd/mdXhl.c (revision 10587) @@ -1,68 +1,71 @@ /* mdXhl.c * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: mdXhl.c,v 1.4 1995/04/27 16:05:51 wollman Exp $ + * $Id: mdXhl.c,v 1.6 1995/07/12 09:13:47 phk Exp $ * */ #include #include #include #include "mdX.h" #include #include #include #include char * -MDXEnd(MDX_CTX *ctx) +MDXEnd(MDX_CTX *ctx, char *buf) { int i; char *p = malloc(33); unsigned char digest[16]; static const char hex[]="0123456789abcdef"; - if(!p) return 0; + if (!p) + p = malloc(33); + if (!p) + return 0; MDXFinal(digest,ctx); - for(i=0;i<16;i++) { + for (i=0;i<16;i++) { p[i+i] = hex[digest[i] >> 4]; p[i+i+1] = hex[digest[i] & 0x0f]; } p[i+i] = '\0'; return p; } char * -MDXFile (char *filename) +MDXFile (char *filename, char *buf) { unsigned char buffer[BUFSIZ]; MDX_CTX ctx; int f,i,j; MDXInit(&ctx); f = open(filename,O_RDONLY); - if(f < 0) return 0; - while((i = read(f,buffer,sizeof buffer)) > 0) { + if (f < 0) return 0; + while ((i = read(f,buffer,sizeof buffer)) > 0) { MDXUpdate(&ctx,buffer,i); } j = errno; close(f); errno = j; - if(i < 0) return 0; - return MDXEnd(&ctx); + if (i < 0) return 0; + return MDXEnd(&ctx, buf); } char * -MDXData (const unsigned char *data, unsigned int len) +MDXData (const unsigned char *data, unsigned int len, char *buf) { MDX_CTX ctx; MDXInit(&ctx); MDXUpdate(&ctx,data,len); - return MDXEnd(&ctx); + return MDXEnd(&ctx, buf); } Index: stable/2.1/lib/libmd/mddriver.c =================================================================== --- stable/2.1/lib/libmd/mddriver.c (revision 10586) +++ stable/2.1/lib/libmd/mddriver.c (revision 10587) @@ -1,65 +1,67 @@ /* MDDRIVER.C - test driver for MD2, MD4 and MD5 * $FreeBSD$ */ /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights reserved. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ /* The following makes MD default to MD5 if it has not already been defined with C compiler flags. */ #ifndef MD #define MD MD5 #endif #include #include #include #if MD == 2 #include "md2.h" #define MDData MD2Data #endif #if MD == 4 #include "md4.h" #define MDData MD4Data #endif #if MD == 5 #include "md5.h" #define MDData MD5Data #endif /* Digests a string and prints the result. */ static void MDString (string) char *string; { + char buf[33]; - printf ("MD%d (\"%s\") = %s\n", MD, string, MDData(string,strlen(string))); + printf ("MD%d (\"%s\") = %s\n", + MD, string, MDData(string,strlen(string),buf)); } /* Digests a reference suite of strings and prints the results. */ main() { printf ("MD%d test suite:\n", MD); MDString (""); MDString ("a"); MDString ("abc"); MDString ("message digest"); MDString ("abcdefghijklmnopqrstuvwxyz"); MDString ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); MDString ("1234567890123456789012345678901234567890\ 1234567890123456789012345678901234567890"); }