[Midnightbsd-cvs] src: lib/libmd: Update libmd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Sep 30 17:59:05 EDT 2008
Log Message:
-----------
Update libmd
Modified Files:
--------------
src/lib/libmd:
md2.h (r1.1.1.1 -> r1.2)
md2c.c (r1.1.1.1 -> r1.2)
md4.h (r1.1.1.1 -> r1.2)
md4c.c (r1.1.1.1 -> r1.2)
md5c.c (r1.1.1.1 -> r1.2)
mdX.3 (r1.1.1.1 -> r1.2)
mdXhl.c (r1.1.1.1 -> r1.2)
ripemd.h (r1.1.1.1 -> r1.2)
rmd160c.c (r1.1.1.1 -> r1.2)
sha.h (r1.1.1.1 -> r1.2)
sha0c.c (r1.1.1.1 -> r1.2)
sha1c.c (r1.1.1.1 -> r1.2)
sha256.3 (r1.1.1.1 -> r1.2)
sha256.h (r1.1.1.1 -> r1.2)
sha256c.c (r1.1.1.1 -> r1.2)
src/lib/libmd/i386:
rmd160.S (r1.2 -> r1.3)
sha.S (r1.2 -> r1.3)
-------------- next part --------------
Index: mdX.3
===================================================================
RCS file: /home/cvs/src/lib/libmd/mdX.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/mdX.3 -L lib/libmd/mdX.3 -u -r1.1.1.1 -r1.2
--- lib/libmd/mdX.3
+++ lib/libmd/mdX.3
@@ -6,7 +6,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ----------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.29 2005/02/15 09:26:59 ru Exp $
+.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.30 2006/01/17 15:35:56 phk Exp $
.\"
.Dd February 11, 1999
.Dt MDX 3
@@ -29,7 +29,7 @@
.Ft void
.Fn MDXInit "MDX_CTX *context"
.Ft void
-.Fn MDXUpdate "MDX_CTX *context" "const unsigned char *data" "unsigned int len"
+.Fn MDXUpdate "MDX_CTX *context" "const void *data" "unsigned int len"
.Ft void
.Fn MDXPad "MDX_CTX *context"
.Ft void
@@ -41,7 +41,7 @@
.Ft "char *"
.Fn MDXFileChunk "const char *filename" "char *buf" "off_t offset" "off_t length"
.Ft "char *"
-.Fn MDXData "const unsigned char *data" "unsigned int len" "char *buf"
+.Fn MDXData "const void *data" "unsigned int len" "char *buf"
.Sh DESCRIPTION
The MDX functions calculate a 128-bit cryptographic checksum (digest)
for any number of input bytes.
Index: sha256.3
===================================================================
RCS file: /home/cvs/src/lib/libmd/sha256.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/sha256.3 -L lib/libmd/sha256.3 -u -r1.1.1.1 -r1.2
--- lib/libmd/sha256.3
+++ lib/libmd/sha256.3
@@ -7,9 +7,9 @@
.\" ----------------------------------------------------------------------------
.\"
.\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD: src/lib/libmd/sha256.3,v 1.2.4.1 2005/10/08 21:46:23 pjd Exp $
+.\" $FreeBSD: src/lib/libmd/sha256.3,v 1.4 2005/11/17 13:00:00 ru Exp $
.\"
-.Dd March 9, 2005
+.Dd September 14, 2005
.Dt SHA256 3
.Os
.Sh NAME
Index: md4.h
===================================================================
RCS file: /home/cvs/src/lib/libmd/md4.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/md4.h -L lib/libmd/md4.h -u -r1.1.1.1 -r1.2
--- lib/libmd/md4.h
+++ lib/libmd/md4.h
@@ -1,5 +1,5 @@
/* MD4.H - header file for MD4C.C
- * $FreeBSD: src/lib/libmd/md4.h,v 1.10 2001/03/17 10:00:50 phk Exp $
+ * $FreeBSD: src/lib/libmd/md4.h,v 1.11 2006/01/17 15:35:56 phk Exp $
*/
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@@ -36,13 +36,13 @@
__BEGIN_DECLS
void MD4Init(MD4_CTX *);
-void MD4Update(MD4_CTX *, const unsigned char *, unsigned int);
+void MD4Update(MD4_CTX *, const void *, unsigned int);
void MD4Pad(MD4_CTX *);
void MD4Final(unsigned char [16], MD4_CTX *);
char * MD4End(MD4_CTX *, char *);
char * MD4File(const char *, char *);
char * MD4FileChunk(const char *, char *, off_t, off_t);
-char * MD4Data(const unsigned char *, unsigned int, char *);
+char * MD4Data(const void *, unsigned int, char *);
__END_DECLS
#endif /* _MD4_H_ */
Index: sha256c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/sha256c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/sha256c.c -L lib/libmd/sha256c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/sha256c.c
+++ lib/libmd/sha256c.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/sha256c.c,v 1.1 2005/03/09 19:23:04 cperciva Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/sha256c.c,v 1.2 2006/01/17 15:35:56 phk Exp $");
#include <sys/endian.h>
#include <sys/types.h>
@@ -240,10 +240,11 @@
/* Add bytes into the hash */
void
-SHA256_Update(SHA256_CTX * ctx, const unsigned char *src, size_t len)
+SHA256_Update(SHA256_CTX * ctx, const void *in, size_t len)
{
uint32_t bitlen[2];
uint32_t r;
+ const unsigned char *src = in;
/* Number of bytes left in the buffer from previous updates */
r = (ctx->count[1] >> 3) & 0x3f;
Index: sha256.h
===================================================================
RCS file: /home/cvs/src/lib/libmd/sha256.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/sha256.h -L lib/libmd/sha256.h -u -r1.1.1.1 -r1.2
--- lib/libmd/sha256.h
+++ lib/libmd/sha256.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libmd/sha256.h,v 1.1 2005/03/09 19:23:04 cperciva Exp $
+ * $FreeBSD: src/lib/libmd/sha256.h,v 1.2 2006/01/17 15:35:56 phk Exp $
*/
#ifndef _SHA256_H_
@@ -39,12 +39,12 @@
__BEGIN_DECLS
void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX *, const unsigned char *, size_t);
+void SHA256_Update(SHA256_CTX *, const void *, size_t);
void SHA256_Final(unsigned char [32], SHA256_CTX *);
char *SHA256_End(SHA256_CTX *, char *);
char *SHA256_File(const char *, char *);
char *SHA256_FileChunk(const char *, char *, off_t, off_t);
-char *SHA256_Data(const unsigned char *, unsigned int, char *);
+char *SHA256_Data(const void *, unsigned int, char *);
__END_DECLS
#endif /* !_SHA256_H_ */
Index: rmd160c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/rmd160c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/rmd160c.c -L lib/libmd/rmd160c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/rmd160c.c
+++ lib/libmd/rmd160c.c
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/rmd160c.c,v 1.6 2002/03/21 23:38:21 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/rmd160c.c,v 1.7 2006/01/17 15:35:56 phk Exp $");
#include <sys/types.h>
@@ -101,14 +101,15 @@
c->num=0;
}
-void RIPEMD160_Update(c, data, len)
+void RIPEMD160_Update(c, in, len)
RIPEMD160_CTX *c;
-const unsigned char *data;
+const void *in;
size_t len;
{
u_int32_t *p;
int sw,sc;
u_int32_t l;
+ const unsigned char *data = in;
if (len == 0) return;
Index: md4c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/md4c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/md4c.c -L lib/libmd/md4c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/md4c.c
+++ lib/libmd/md4c.c
@@ -2,7 +2,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/md4c.c,v 1.9 2003/06/05 13:17:32 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/md4c.c,v 1.10 2006/01/17 15:35:56 phk Exp $");
/* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
@@ -107,12 +107,13 @@
operation, processing another message block, and updating the
context.
*/
-void MD4Update (context, input, inputLen)
+void MD4Update (context, in, inputLen)
MD4_CTX *context; /* context */
-const unsigned char *input; /* input block */
+const void *in; /* input block */
unsigned int inputLen; /* length of input block */
{
unsigned int i, idx, partLen;
+ const unsigned char *input = in;
/* Compute number of bytes mod 64 */
idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
Index: md2c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/md2c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/md2c.c -L lib/libmd/md2c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/md2c.c
+++ lib/libmd/md2c.c
@@ -2,7 +2,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/md2c.c,v 1.10 2003/06/05 13:17:32 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/md2c.c,v 1.11 2006/01/17 15:35:56 phk Exp $");
/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
rights reserved.
@@ -99,12 +99,13 @@
operation, processing another message block, and updating the
context.
*/
-void MD2Update (context, input, inputLen)
+void MD2Update (context, in, inputLen)
MD2_CTX *context; /* context */
-const unsigned char *input; /* input block */
+const void *in; /* input block */
unsigned int inputLen; /* length of input block */
{
unsigned int i, idx, partLen;
+ const unsigned char *input = in;
/* Update number of bytes mod 16 */
idx = context->count;
Index: sha1c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/sha1c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/sha1c.c -L lib/libmd/sha1c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/sha1c.c
+++ lib/libmd/sha1c.c
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/sha1c.c,v 1.4 2002/03/21 23:38:21 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/sha1c.c,v 1.5 2006/01/17 15:35:56 phk Exp $");
#include <sys/types.h>
@@ -143,14 +143,15 @@
}
void
-SHA1_Update(c, data, len)
+SHA1_Update(c, in, len)
SHA_CTX *c;
- const unsigned char *data;
+ const void *in;
size_t len;
{
u_int32_t *p;
int ew,ec,sw,sc;
u_int32_t l;
+ const unsigned char *data = in;
if (len == 0) return;
Index: mdXhl.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/mdXhl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/mdXhl.c -L lib/libmd/mdXhl.c -u -r1.1.1.1 -r1.2
--- lib/libmd/mdXhl.c
+++ lib/libmd/mdXhl.c
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/mdXhl.c,v 1.18 2002/09/08 15:10:04 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/mdXhl.c,v 1.19 2006/01/17 15:35:56 phk Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -88,7 +88,7 @@
}
char *
-MDXData (const unsigned char *data, unsigned int len, char *buf)
+MDXData (const void *data, unsigned int len, char *buf)
{
MDX_CTX ctx;
Index: ripemd.h
===================================================================
RCS file: /home/cvs/src/lib/libmd/ripemd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/ripemd.h -L lib/libmd/ripemd.h -u -r1.1.1.1 -r1.2
--- lib/libmd/ripemd.h
+++ lib/libmd/ripemd.h
@@ -57,7 +57,7 @@
*/
/*
- * $FreeBSD: src/lib/libmd/ripemd.h,v 1.2 2001/03/17 10:00:50 phk Exp $
+ * $FreeBSD: src/lib/libmd/ripemd.h,v 1.3 2006/01/17 15:35:56 phk Exp $
*/
#ifndef HEADER_RIPEMD_H
@@ -82,13 +82,13 @@
__BEGIN_DECLS
void RIPEMD160_Init(RIPEMD160_CTX *c);
-void RIPEMD160_Update(RIPEMD160_CTX *c, const unsigned char *data,
+void RIPEMD160_Update(RIPEMD160_CTX *c, const void *data,
size_t len);
void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
char *RIPEMD160_End(RIPEMD160_CTX *, char *);
char *RIPEMD160_File(const char *, char *);
char *RIPEMD160_FileChunk(const char *, char *, off_t, off_t);
-char *RIPEMD160_Data(const unsigned char *, unsigned int, char *);
+char *RIPEMD160_Data(const void *, unsigned int, char *);
__END_DECLS
#endif
Index: sha0c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/sha0c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/sha0c.c -L lib/libmd/sha0c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/sha0c.c
+++ lib/libmd/sha0c.c
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/sha0c.c,v 1.5 2002/03/21 23:38:21 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/sha0c.c,v 1.6 2006/01/17 15:35:56 phk Exp $");
#include <sys/types.h>
@@ -115,14 +115,15 @@
c->num=0;
}
-void SHA_Update(c, data, len)
+void SHA_Update(c, in, len)
SHA_CTX *c;
-const unsigned char *data;
+const void *in;
size_t len;
{
u_int32_t *p;
int ew,ec,sw,sc;
u_int32_t l;
+ const unsigned char *data = in;
if (len == 0) return;
Index: sha.h
===================================================================
RCS file: /home/cvs/src/lib/libmd/sha.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/sha.h -L lib/libmd/sha.h -u -r1.1.1.1 -r1.2
--- lib/libmd/sha.h
+++ lib/libmd/sha.h
@@ -54,7 +54,7 @@
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*
- * $FreeBSD: src/lib/libmd/sha.h,v 1.4 2001/03/17 10:00:50 phk Exp $
+ * $FreeBSD: src/lib/libmd/sha.h,v 1.5 2006/01/17 15:35:56 phk Exp $
*/
#ifndef _SHA_H_
@@ -80,19 +80,19 @@
__BEGIN_DECLS
void SHA_Init(SHA_CTX *c);
-void SHA_Update(SHA_CTX *c, const unsigned char *data, size_t len);
+void SHA_Update(SHA_CTX *c, const void *data, size_t len);
void SHA_Final(unsigned char *md, SHA_CTX *c);
char *SHA_End(SHA_CTX *, char *);
char *SHA_File(const char *, char *);
char *SHA_FileChunk(const char *, char *, off_t, off_t);
-char *SHA_Data(const unsigned char *, unsigned int, char *);
+char *SHA_Data(const void *, unsigned int, char *);
void SHA1_Init(SHA_CTX *c);
-void SHA1_Update(SHA_CTX *c, const unsigned char *data, size_t len);
+void SHA1_Update(SHA_CTX *c, const void *data, size_t len);
void SHA1_Final(unsigned char *md, SHA_CTX *c);
char *SHA1_End(SHA_CTX *, char *);
char *SHA1_File(const char *, char *);
char *SHA1_FileChunk(const char *, char *, off_t, off_t);
-char *SHA1_Data(const unsigned char *, unsigned int, char *);
+char *SHA1_Data(const void *, unsigned int, char *);
__END_DECLS
#endif /* !_SHA_H_ */
Index: md2.h
===================================================================
RCS file: /home/cvs/src/lib/libmd/md2.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/md2.h -L lib/libmd/md2.h -u -r1.1.1.1 -r1.2
--- lib/libmd/md2.h
+++ lib/libmd/md2.h
@@ -1,5 +1,5 @@
/* MD2.H - header file for MD2C.C
- * $FreeBSD: src/lib/libmd/md2.h,v 1.9 2001/03/17 10:00:50 phk Exp $
+ * $FreeBSD: src/lib/libmd/md2.h,v 1.10 2006/01/17 15:35:56 phk Exp $
*/
/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
@@ -34,13 +34,13 @@
__BEGIN_DECLS
void MD2Init(MD2_CTX *);
-void MD2Update(MD2_CTX *, const unsigned char *, unsigned int);
+void MD2Update(MD2_CTX *, const void *, unsigned int);
void MD2Pad(MD2_CTX *);
void MD2Final(unsigned char [16], MD2_CTX *);
char * MD2End(MD2_CTX *, char *);
char * MD2File(const char *, char *);
char * MD2FileChunk(const char *, char *, off_t, off_t);
-char * MD2Data(const unsigned char *, unsigned int, char *);
+char * MD2Data(const void *, unsigned int, char *);
__END_DECLS
#endif /* _MD2_H_ */
Index: md5c.c
===================================================================
RCS file: /home/cvs/src/lib/libmd/md5c.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libmd/md5c.c -L lib/libmd/md5c.c -u -r1.1.1.1 -r1.2
--- lib/libmd/md5c.c
+++ lib/libmd/md5c.c
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.16 2003/06/05 13:17:32 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.17 2006/01/17 15:35:56 phk Exp $");
#include <sys/types.h>
@@ -147,12 +147,13 @@
*/
void
-MD5Update (context, input, inputLen)
+MD5Update (context, in, inputLen)
MD5_CTX *context;
- const unsigned char *input;
+ const void *in;
unsigned int inputLen;
{
unsigned int i, idx, partLen;
+ const unsigned char *input = in;
/* Compute number of bytes mod 64 */
idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
Index: sha.S
===================================================================
RCS file: /home/cvs/src/lib/libmd/i386/sha.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libmd/i386/sha.S -L lib/libmd/i386/sha.S -u -r1.2 -r1.3
--- lib/libmd/i386/sha.S
+++ lib/libmd/i386/sha.S
@@ -1,4 +1,4 @@
-/* $MidnightBSD$ */
+/* $FreeBSD: src/lib/libmd/i386/sha.S,v 1.3 2007/05/14 05:00:37 cperciva Exp $ */
/* -*- Fundamental -*- Emacs' assembler mode hoses this file */
#ifndef PIC
/* Run the C pre-processor over this file with one of the following defined
Index: rmd160.S
===================================================================
RCS file: /home/cvs/src/lib/libmd/i386/rmd160.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libmd/i386/rmd160.S -L lib/libmd/i386/rmd160.S -u -r1.2 -r1.3
--- lib/libmd/i386/rmd160.S
+++ lib/libmd/i386/rmd160.S
@@ -1,4 +1,4 @@
-/* $MidnightBSD$ */
+/* $FreeBSD: src/lib/libmd/i386/rmd160.S,v 1.4 2007/05/14 05:00:37 cperciva Exp $ */
/* Run the C pre-processor over this file with one of the following defined
* ELF - elf object files,
* OUT - a.out object files,
More information about the Midnightbsd-cvs
mailing list