aboutsummaryrefslogtreecommitdiff
path: root/contrib/isc-dhcp/dst
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2004-06-26 10:34:24 +0000
committerMartin Blapp <mbr@FreeBSD.org>2004-06-26 10:34:24 +0000
commita838a2f0bb98e3688c176887d3eff90d1e3c6354 (patch)
tree40e3f7a1fd568e909f483804a6cc93f08d2a10d0 /contrib/isc-dhcp/dst
parent92633f6fc8cacd902d4017e2c2f2739879691b00 (diff)
downloadsrc-a838a2f0bb98e3688c176887d3eff90d1e3c6354.tar.gz
src-a838a2f0bb98e3688c176887d3eff90d1e3c6354.zip
Import ISC DHCP 3.0.1 RC14 client.
Notes
Notes: svn path=/vendor/isc-dhcp/dist/; revision=131136
Diffstat (limited to 'contrib/isc-dhcp/dst')
-rw-r--r--contrib/isc-dhcp/dst/Makefile.dist30
-rw-r--r--contrib/isc-dhcp/dst/base64.c26
-rw-r--r--contrib/isc-dhcp/dst/dst_api.c2
-rw-r--r--contrib/isc-dhcp/dst/dst_support.c2
-rw-r--r--contrib/isc-dhcp/dst/hmac_link.c2
-rw-r--r--contrib/isc-dhcp/dst/md5_dgst.c128
-rw-r--r--contrib/isc-dhcp/dst/md5_locl.h9
-rw-r--r--contrib/isc-dhcp/dst/prandom.c2
8 files changed, 105 insertions, 96 deletions
diff --git a/contrib/isc-dhcp/dst/Makefile.dist b/contrib/isc-dhcp/dst/Makefile.dist
index 2c8c104f5d2c..ffe7e4ebf3da 100644
--- a/contrib/isc-dhcp/dst/Makefile.dist
+++ b/contrib/isc-dhcp/dst/Makefile.dist
@@ -1,21 +1,25 @@
# Makefile.dist
#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it. If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
+# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1996-2003 by Internet Software Consortium
#
-# http://www.isc.org/isc-license-1.0.html.
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
#
-# This file is part of the ISC DHCP distribution. The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
+# Internet Systems Consortium, Inc.
+# 950 Charter Street
+# Redwood City, CA 94063
+# <info@isc.org>
+# http://www.isc.org/
SRC = dst_support.c dst_api.c hmac_link.c md5_dgst.c base64.c prandom.c
OBJ = dst_support.o dst_api.o hmac_link.o md5_dgst.o base64.o prandom.o
diff --git a/contrib/isc-dhcp/dst/base64.c b/contrib/isc-dhcp/dst/base64.c
index dff9412f1754..0f6d14bb53a3 100644
--- a/contrib/isc-dhcp/dst/base64.c
+++ b/contrib/isc-dhcp/dst/base64.c
@@ -1,18 +1,24 @@
/*
- * Copyright (c) 1996-1999 by Internet Software Consortium.
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 1996-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Internet Systems Consortium, Inc.
+ * 950 Charter Street
+ * Redwood City, CA 94063
+ * <info@isc.org>
+ * http://www.isc.org/
*/
/*
@@ -41,7 +47,7 @@
*/
#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: base64.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
+static const char rcsid[] = "$Id: base64.c,v 1.1.2.1 2004/06/10 17:59:28 dhankins Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/contrib/isc-dhcp/dst/dst_api.c b/contrib/isc-dhcp/dst/dst_api.c
index 22be12020856..64114cb1ebc4 100644
--- a/contrib/isc-dhcp/dst/dst_api.c
+++ b/contrib/isc-dhcp/dst/dst_api.c
@@ -1,5 +1,5 @@
#ifndef LINT
-static const char rcsid[] = "$Header: /rc0/proj/cvs/isc/DHCP/dst/dst_api.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/dst_api.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
#endif
/*
diff --git a/contrib/isc-dhcp/dst/dst_support.c b/contrib/isc-dhcp/dst/dst_support.c
index 4d3692055f7a..2d7a67f12036 100644
--- a/contrib/isc-dhcp/dst/dst_support.c
+++ b/contrib/isc-dhcp/dst/dst_support.c
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Header: /rc0/proj/cvs/isc/DHCP/dst/dst_support.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/dst_support.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
/*
diff --git a/contrib/isc-dhcp/dst/hmac_link.c b/contrib/isc-dhcp/dst/hmac_link.c
index dbb6d861a7b9..90b92e2c23cb 100644
--- a/contrib/isc-dhcp/dst/hmac_link.c
+++ b/contrib/isc-dhcp/dst/hmac_link.c
@@ -1,6 +1,6 @@
#ifdef HMAC_MD5
#ifndef LINT
-static const char rcsid[] = "$Header: /rc0/proj/cvs/isc/DHCP/dst/hmac_link.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/hmac_link.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
#endif
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
diff --git a/contrib/isc-dhcp/dst/md5_dgst.c b/contrib/isc-dhcp/dst/md5_dgst.c
index 2a714ce57ea4..25dd51b759f9 100644
--- a/contrib/isc-dhcp/dst/md5_dgst.c
+++ b/contrib/isc-dhcp/dst/md5_dgst.c
@@ -224,73 +224,73 @@ register ULONG *X;
D=c->D;
/* Round 0 */
- R0(A,B,C,D,X[ 0], 7,0xd76aa478L);
- R0(D,A,B,C,X[ 1],12,0xe8c7b756L);
- R0(C,D,A,B,X[ 2],17,0x242070dbL);
- R0(B,C,D,A,X[ 3],22,0xc1bdceeeL);
- R0(A,B,C,D,X[ 4], 7,0xf57c0fafL);
- R0(D,A,B,C,X[ 5],12,0x4787c62aL);
- R0(C,D,A,B,X[ 6],17,0xa8304613L);
- R0(B,C,D,A,X[ 7],22,0xfd469501L);
- R0(A,B,C,D,X[ 8], 7,0x698098d8L);
- R0(D,A,B,C,X[ 9],12,0x8b44f7afL);
- R0(C,D,A,B,X[10],17,0xffff5bb1L);
- R0(B,C,D,A,X[11],22,0x895cd7beL);
- R0(A,B,C,D,X[12], 7,0x6b901122L);
- R0(D,A,B,C,X[13],12,0xfd987193L);
- R0(C,D,A,B,X[14],17,0xa679438eL);
- R0(B,C,D,A,X[15],22,0x49b40821L);
+ LOCL_R0(A,B,C,D,X[ 0], 7,0xd76aa478L);
+ LOCL_R0(D,A,B,C,X[ 1],12,0xe8c7b756L);
+ LOCL_R0(C,D,A,B,X[ 2],17,0x242070dbL);
+ LOCL_R0(B,C,D,A,X[ 3],22,0xc1bdceeeL);
+ LOCL_R0(A,B,C,D,X[ 4], 7,0xf57c0fafL);
+ LOCL_R0(D,A,B,C,X[ 5],12,0x4787c62aL);
+ LOCL_R0(C,D,A,B,X[ 6],17,0xa8304613L);
+ LOCL_R0(B,C,D,A,X[ 7],22,0xfd469501L);
+ LOCL_R0(A,B,C,D,X[ 8], 7,0x698098d8L);
+ LOCL_R0(D,A,B,C,X[ 9],12,0x8b44f7afL);
+ LOCL_R0(C,D,A,B,X[10],17,0xffff5bb1L);
+ LOCL_R0(B,C,D,A,X[11],22,0x895cd7beL);
+ LOCL_R0(A,B,C,D,X[12], 7,0x6b901122L);
+ LOCL_R0(D,A,B,C,X[13],12,0xfd987193L);
+ LOCL_R0(C,D,A,B,X[14],17,0xa679438eL);
+ LOCL_R0(B,C,D,A,X[15],22,0x49b40821L);
/* Round 1 */
- R1(A,B,C,D,X[ 1], 5,0xf61e2562L);
- R1(D,A,B,C,X[ 6], 9,0xc040b340L);
- R1(C,D,A,B,X[11],14,0x265e5a51L);
- R1(B,C,D,A,X[ 0],20,0xe9b6c7aaL);
- R1(A,B,C,D,X[ 5], 5,0xd62f105dL);
- R1(D,A,B,C,X[10], 9,0x02441453L);
- R1(C,D,A,B,X[15],14,0xd8a1e681L);
- R1(B,C,D,A,X[ 4],20,0xe7d3fbc8L);
- R1(A,B,C,D,X[ 9], 5,0x21e1cde6L);
- R1(D,A,B,C,X[14], 9,0xc33707d6L);
- R1(C,D,A,B,X[ 3],14,0xf4d50d87L);
- R1(B,C,D,A,X[ 8],20,0x455a14edL);
- R1(A,B,C,D,X[13], 5,0xa9e3e905L);
- R1(D,A,B,C,X[ 2], 9,0xfcefa3f8L);
- R1(C,D,A,B,X[ 7],14,0x676f02d9L);
- R1(B,C,D,A,X[12],20,0x8d2a4c8aL);
+ LOCL_R1(A,B,C,D,X[ 1], 5,0xf61e2562L);
+ LOCL_R1(D,A,B,C,X[ 6], 9,0xc040b340L);
+ LOCL_R1(C,D,A,B,X[11],14,0x265e5a51L);
+ LOCL_R1(B,C,D,A,X[ 0],20,0xe9b6c7aaL);
+ LOCL_R1(A,B,C,D,X[ 5], 5,0xd62f105dL);
+ LOCL_R1(D,A,B,C,X[10], 9,0x02441453L);
+ LOCL_R1(C,D,A,B,X[15],14,0xd8a1e681L);
+ LOCL_R1(B,C,D,A,X[ 4],20,0xe7d3fbc8L);
+ LOCL_R1(A,B,C,D,X[ 9], 5,0x21e1cde6L);
+ LOCL_R1(D,A,B,C,X[14], 9,0xc33707d6L);
+ LOCL_R1(C,D,A,B,X[ 3],14,0xf4d50d87L);
+ LOCL_R1(B,C,D,A,X[ 8],20,0x455a14edL);
+ LOCL_R1(A,B,C,D,X[13], 5,0xa9e3e905L);
+ LOCL_R1(D,A,B,C,X[ 2], 9,0xfcefa3f8L);
+ LOCL_R1(C,D,A,B,X[ 7],14,0x676f02d9L);
+ LOCL_R1(B,C,D,A,X[12],20,0x8d2a4c8aL);
/* Round 2 */
- R2(A,B,C,D,X[ 5], 4,0xfffa3942L);
- R2(D,A,B,C,X[ 8],11,0x8771f681L);
- R2(C,D,A,B,X[11],16,0x6d9d6122L);
- R2(B,C,D,A,X[14],23,0xfde5380cL);
- R2(A,B,C,D,X[ 1], 4,0xa4beea44L);
- R2(D,A,B,C,X[ 4],11,0x4bdecfa9L);
- R2(C,D,A,B,X[ 7],16,0xf6bb4b60L);
- R2(B,C,D,A,X[10],23,0xbebfbc70L);
- R2(A,B,C,D,X[13], 4,0x289b7ec6L);
- R2(D,A,B,C,X[ 0],11,0xeaa127faL);
- R2(C,D,A,B,X[ 3],16,0xd4ef3085L);
- R2(B,C,D,A,X[ 6],23,0x04881d05L);
- R2(A,B,C,D,X[ 9], 4,0xd9d4d039L);
- R2(D,A,B,C,X[12],11,0xe6db99e5L);
- R2(C,D,A,B,X[15],16,0x1fa27cf8L);
- R2(B,C,D,A,X[ 2],23,0xc4ac5665L);
+ LOCL_R2(A,B,C,D,X[ 5], 4,0xfffa3942L);
+ LOCL_R2(D,A,B,C,X[ 8],11,0x8771f681L);
+ LOCL_R2(C,D,A,B,X[11],16,0x6d9d6122L);
+ LOCL_R2(B,C,D,A,X[14],23,0xfde5380cL);
+ LOCL_R2(A,B,C,D,X[ 1], 4,0xa4beea44L);
+ LOCL_R2(D,A,B,C,X[ 4],11,0x4bdecfa9L);
+ LOCL_R2(C,D,A,B,X[ 7],16,0xf6bb4b60L);
+ LOCL_R2(B,C,D,A,X[10],23,0xbebfbc70L);
+ LOCL_R2(A,B,C,D,X[13], 4,0x289b7ec6L);
+ LOCL_R2(D,A,B,C,X[ 0],11,0xeaa127faL);
+ LOCL_R2(C,D,A,B,X[ 3],16,0xd4ef3085L);
+ LOCL_R2(B,C,D,A,X[ 6],23,0x04881d05L);
+ LOCL_R2(A,B,C,D,X[ 9], 4,0xd9d4d039L);
+ LOCL_R2(D,A,B,C,X[12],11,0xe6db99e5L);
+ LOCL_R2(C,D,A,B,X[15],16,0x1fa27cf8L);
+ LOCL_R2(B,C,D,A,X[ 2],23,0xc4ac5665L);
/* Round 3 */
- R3(A,B,C,D,X[ 0], 6,0xf4292244L);
- R3(D,A,B,C,X[ 7],10,0x432aff97L);
- R3(C,D,A,B,X[14],15,0xab9423a7L);
- R3(B,C,D,A,X[ 5],21,0xfc93a039L);
- R3(A,B,C,D,X[12], 6,0x655b59c3L);
- R3(D,A,B,C,X[ 3],10,0x8f0ccc92L);
- R3(C,D,A,B,X[10],15,0xffeff47dL);
- R3(B,C,D,A,X[ 1],21,0x85845dd1L);
- R3(A,B,C,D,X[ 8], 6,0x6fa87e4fL);
- R3(D,A,B,C,X[15],10,0xfe2ce6e0L);
- R3(C,D,A,B,X[ 6],15,0xa3014314L);
- R3(B,C,D,A,X[13],21,0x4e0811a1L);
- R3(A,B,C,D,X[ 4], 6,0xf7537e82L);
- R3(D,A,B,C,X[11],10,0xbd3af235L);
- R3(C,D,A,B,X[ 2],15,0x2ad7d2bbL);
- R3(B,C,D,A,X[ 9],21,0xeb86d391L);
+ LOCL_R3(A,B,C,D,X[ 0], 6,0xf4292244L);
+ LOCL_R3(D,A,B,C,X[ 7],10,0x432aff97L);
+ LOCL_R3(C,D,A,B,X[14],15,0xab9423a7L);
+ LOCL_R3(B,C,D,A,X[ 5],21,0xfc93a039L);
+ LOCL_R3(A,B,C,D,X[12], 6,0x655b59c3L);
+ LOCL_R3(D,A,B,C,X[ 3],10,0x8f0ccc92L);
+ LOCL_R3(C,D,A,B,X[10],15,0xffeff47dL);
+ LOCL_R3(B,C,D,A,X[ 1],21,0x85845dd1L);
+ LOCL_R3(A,B,C,D,X[ 8], 6,0x6fa87e4fL);
+ LOCL_R3(D,A,B,C,X[15],10,0xfe2ce6e0L);
+ LOCL_R3(C,D,A,B,X[ 6],15,0xa3014314L);
+ LOCL_R3(B,C,D,A,X[13],21,0x4e0811a1L);
+ LOCL_R3(A,B,C,D,X[ 4], 6,0xf7537e82L);
+ LOCL_R3(D,A,B,C,X[11],10,0xbd3af235L);
+ LOCL_R3(C,D,A,B,X[ 2],15,0x2ad7d2bbL);
+ LOCL_R3(B,C,D,A,X[ 9],21,0xeb86d391L);
c->A+=A&0xffffffffL;
c->B+=B&0xffffffffL;
diff --git a/contrib/isc-dhcp/dst/md5_locl.h b/contrib/isc-dhcp/dst/md5_locl.h
index b2f0028fbd36..c52d73377def 100644
--- a/contrib/isc-dhcp/dst/md5_locl.h
+++ b/contrib/isc-dhcp/dst/md5_locl.h
@@ -168,23 +168,22 @@
#define ROTATE(a,n) (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
#endif
-
-#define R0(a,b,c,d,k,s,t) { \
+#define LOCL_R0(a,b,c,d,k,s,t) { \
a+=((k)+(t)+F((b),(c),(d))); \
a=ROTATE(a,s); \
a+=b; };\
-#define R1(a,b,c,d,k,s,t) { \
+#define LOCL_R1(a,b,c,d,k,s,t) { \
a+=((k)+(t)+G((b),(c),(d))); \
a=ROTATE(a,s); \
a+=b; };
-#define R2(a,b,c,d,k,s,t) { \
+#define LOCL_R2(a,b,c,d,k,s,t) { \
a+=((k)+(t)+H((b),(c),(d))); \
a=ROTATE(a,s); \
a+=b; };
-#define R3(a,b,c,d,k,s,t) { \
+#define LOCL_R3(a,b,c,d,k,s,t) { \
a+=((k)+(t)+I((b),(c),(d))); \
a=ROTATE(a,s); \
a+=b; };
diff --git a/contrib/isc-dhcp/dst/prandom.c b/contrib/isc-dhcp/dst/prandom.c
index 53d2b2e2611d..7d9853ed91c1 100644
--- a/contrib/isc-dhcp/dst/prandom.c
+++ b/contrib/isc-dhcp/dst/prandom.c
@@ -1,5 +1,5 @@
#ifndef LINT
-static const char rcsid[] = "$Header: /rc0/proj/cvs/isc/DHCP/dst/prandom.c,v 1.1 2001/02/22 07:22:09 mellon Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/prandom.c,v 1.1 2001/02/22 07:22:09 mellon Exp $";
#endif
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.