diff options
| author | atatat <atatat@NetBSD.org> | 2001-03-19 04:13:16 +0000 |
|---|---|---|
| committer | atatat <atatat@NetBSD.org> | 2001-03-19 04:13:16 +0000 |
| commit | 3ddb3899a39fa4f585964e041d7db5b1dfd62a2b (patch) | |
| tree | 850c6d94a0369c4e3b9174d64a7f74ebc15c5b0e | |
| parent | 71a78d90a98a0f22cd87204da39cf098d06a2715 (diff) | |
Add md2 routines to libc.
| -rw-r--r-- | include/Makefile | 4 | ||||
| -rw-r--r-- | lib/libc/include/namespace.h | 5 | ||||
| -rw-r--r-- | lib/libc/md/Makefile.inc | 16 | ||||
| -rw-r--r-- | lib/libc/md/md2.copyright | 2 | ||||
| -rw-r--r-- | lib/libc/md/md2c.c | 180 | ||||
| -rw-r--r-- | lib/libc/md/md2hl.c | 13 |
6 files changed, 212 insertions, 8 deletions
diff --git a/include/Makefile b/include/Makefile index 350761a2470..64a4dfd05a4 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2001/02/17 12:29:45 ragge Exp $ +# $NetBSD: Makefile,v 1.96 2001/03/19 04:13:16 atatat Exp $ # @(#)Makefile 8.2 (Berkeley) 1/4/94 # Doing a make includes builds /usr/include @@ -10,7 +10,7 @@ INCS= a.out.h ar.h assert.h bitstring.h bm.h cpio.h ctype.h db.h dirent.h \ getopt.h glob.h grp.h hesiod.h ifaddrs.h \ iso646.h kvm.h langinfo.h libgen.h \ limits.h link.h link_aout.h link_elf.h locale.h \ - login_cap.h malloc.h math.h md4.h md5.h \ + login_cap.h malloc.h math.h md2.h md4.h md5.h \ memory.h mpool.h ndbm.h netconfig.h netdb.h netgroup.h nlist.h \ nl_types.h \ nsswitch.h paths.h pwd.h ranlib.h re_comp.h regex.h regexp.h \ diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h index 307b6b110b8..4bacaff20e2 100644 --- a/lib/libc/include/namespace.h +++ b/lib/libc/include/namespace.h @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.60 2001/02/19 22:11:40 cgd Exp $ */ +/* $NetBSD: namespace.h,v 1.61 2001/03/19 04:13:17 atatat Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,6 +65,9 @@ #define warnx _warnx #ifdef __weak_alias +#define MD2Final _MD2Final +#define MD2Init _MD2Init +#define MD2Update _MD2Update #define MD4Final _MD4Final #define MD4Init _MD4Init #define MD4Update _MD4Update diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc index 7231d5ea1c1..8fb1571706a 100644 --- a/lib/libc/md/Makefile.inc +++ b/lib/libc/md/Makefile.inc @@ -1,22 +1,28 @@ -# $NetBSD: Makefile.inc,v 1.5 1999/02/24 15:05:21 drochner Exp $ +# $NetBSD: Makefile.inc,v 1.6 2001/03/19 04:13:17 atatat Exp $ .include <bsd.own.mk> -# MD4/MD5 sources +# MD2/MD4/MD5 sources .PATH: ${ARCHDIR}/md ${.CURDIR}/md -SRCS+= md4c.c md5c.c md4hl.c md5hl.c +SRCS+= md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c -MAN+= md4.3 md5.3 +MAN+= md2.3 md4.3 md5.3 +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[45]hl.c md[45].3 +CLEANFILES+= md[245]hl.c md[245].3 .if ${MKMAN} != "no" +md2.3: mdX.3 + sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' $> > $@ + cat ${>:H}/md2.copyright >> $@ + md4.3: mdX.3 sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' $> > $@ cat ${>:H}/md4.copyright >> $@ diff --git a/lib/libc/md/md2.copyright b/lib/libc/md/md2.copyright new file mode 100644 index 00000000000..93bf8cf72b7 --- /dev/null +++ b/lib/libc/md/md2.copyright @@ -0,0 +1,2 @@ +.\" $NetBSD: md2.copyright,v 1.1 2001/03/19 04:13:17 atatat Exp $ +This code is in the public domain. diff --git a/lib/libc/md/md2c.c b/lib/libc/md/md2c.c new file mode 100644 index 00000000000..e525e9f7e4c --- /dev/null +++ b/lib/libc/md/md2c.c @@ -0,0 +1,180 @@ +/* $NetBSD: md2c.c,v 1.1 2001/03/19 04:13:17 atatat Exp $ */ + +/* + * Copyright (c) 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Andrew Brown. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "namespace.h" + +#include <sys/types.h> + +#include <assert.h> +#include <md2.h> +#include <string.h> + +/* cut-n-pasted from rfc1319 */ +static unsigned char S[256] = { + 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, + 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, + 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, + 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, + 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, + 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, + 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, + 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, + 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, + 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, + 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, + 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, + 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, + 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, + 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, + 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, + 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, + 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 +}; + +/* cut-n-pasted from rfc1319 */ +static unsigned char *pad[] = { + (unsigned char *)"", + (unsigned char *)"\001", + (unsigned char *)"\002\002", + (unsigned char *)"\003\003\003", + (unsigned char *)"\004\004\004\004", + (unsigned char *)"\005\005\005\005\005", + (unsigned char *)"\006\006\006\006\006\006", + (unsigned char *)"\007\007\007\007\007\007\007", + (unsigned char *)"\010\010\010\010\010\010\010\010", + (unsigned char *)"\011\011\011\011\011\011\011\011\011", + (unsigned char *)"\012\012\012\012\012\012\012\012\012\012", + (unsigned char *)"\013\013\013\013\013\013\013\013\013\013\013", + (unsigned char *)"\014\014\014\014\014\014\014\014\014\014\014\014", + (unsigned char *) + "\015\015\015\015\015\015\015\015\015\015\015\015\015", + (unsigned char *) + "\016\016\016\016\016\016\016\016\016\016\016\016\016\016", + (unsigned char *) + "\017\017\017\017\017\017\017\017\017\017\017\017\017\017\017", + (unsigned char *) + "\020\020\020\020\020\020\020\020\020\020\020\020\020\020\020\020" +}; + +static void MD2Transform __P((MD2_CTX *)); + +#ifdef __weak_alias +__weak_alias(MD2Init,_MD2Init) +__weak_alias(MD2Update,_MD2Update) +__weak_alias(MD2Final,_MD2Final) +#endif + +void +MD2Init(context) + MD2_CTX *context; +{ + _DIAGASSERT(context != 0); + + context->i = 16; + memset(&context->C[0], 0, sizeof(context->C)); + memset(&context->X[0], 0, sizeof(context->X)); +} + +void +MD2Update(context, input, inputLen) + MD2_CTX *context; + const unsigned char *input; + unsigned int inputLen; +{ + unsigned int idx, piece; + + _DIAGASSERT(context != 0); + _DIAGASSERT(input != 0); + + for (idx = 0; idx < inputLen; idx += piece) { + piece = 32 - context->i; + if ((inputLen - idx) < piece) + piece = inputLen - idx; + memcpy(&context->X[context->i], &input[idx], + (unsigned long) piece); + if ((context->i += piece) == 32) + MD2Transform(context); /* resets i */ + } +} + +void +MD2Final(digest, context) + unsigned char digest[16]; /* message digest */ + MD2_CTX *context; /* context */ +{ + unsigned int padlen; + + _DIAGASSERT(digest != 0); + _DIAGASSERT(context != 0); + + /* padlen should be 1..16 */ + padlen = 32 - context->i; + + /* add padding */ + MD2Update(context, pad[padlen], padlen); + + /* add checksum */ + MD2Update(context, &context->C[0], (unsigned int) sizeof(context->C)); + + /* copy out final digest */ + memcpy(digest, &context->X[0], (unsigned long) 16); + + /* reset the context */ + MD2Init(context); +} + +static void +MD2Transform(context) + MD2_CTX *context; +{ + u_int32_t l, j, k, t; + + /* set block "3" and update "checksum" */ + for (l = context->C[15], j = 0; j < 16; j++) { + context->X[32 + j] = context->X[j] ^ context->X[16 + j]; + l = context->C[j] ^= S[context->X[16 + j] ^ l]; + } + + /* mangle input block */ + for (t = j = 0; j < 18; t = (t + j) % 256, j++) + for (k = 0; k < 48; k++) + t = context->X[k] = (context->X[k] ^ S[t]); + + /* reset input pointer */ + context->i = 16; +} diff --git a/lib/libc/md/md2hl.c b/lib/libc/md/md2hl.c new file mode 100644 index 00000000000..52deed70e1c --- /dev/null +++ b/lib/libc/md/md2hl.c @@ -0,0 +1,13 @@ +/* $NetBSD: md2hl.c,v 1.1 2001/03/19 04:13:17 atatat Exp $ */ + +/* + * Written by Jason R. Thorpe <thorpej@netbsd.org>, April 29, 1997. + * Public domain. + */ + +#define MDALGORITHM MD2 + +#include "namespace.h" +#include <md2.h> + +#include "mdXhl.c" |
