This commit was generated by cvs2svn to compensate for changes in r3215,

which included commits to RCS files with non-trunk default branches.

13 files changed, 133 insertions, 122 deletions

diff --git a/usr.sbin/xntpd/authstuff/Makefile.tmpl b/usr.sbin/xntpd/authstuff/Makefile.tmpl
index 4c8ca57..ccafc5b 100644
--- a/usr.sbin/xntpd/authstuff/Makefile.tmpl
+++ b/usr.sbin/xntpd/authstuff/Makefile.tmpl
@@ -1,5 +1,5 @@
 #
-# Makefile.tmpl,v 3.1 1993/07/06 01:04:48 jbj Exp
+# Makefile.tmpl
 #
 PROGRAM=	authcert authspeed md5
 #
diff --git a/usr.sbin/xntpd/authstuff/auth.samplekeys b/usr.sbin/xntpd/authstuff/auth.samplekeys
index c46d283..761c7c2 100644
--- a/usr.sbin/xntpd/authstuff/auth.samplekeys
+++ b/usr.sbin/xntpd/authstuff/auth.samplekeys
@@ -1,4 +1,3 @@
-# auth.samplekeys,v 3.1 1993/07/06 01:04:49 jbj Exp
 #
 # Sample key file, also used for testing.
 #
diff --git a/usr.sbin/xntpd/authstuff/auth.speed b/usr.sbin/xntpd/authstuff/auth.speed
index b55f20c..ccf8993 100644
--- a/usr.sbin/xntpd/authstuff/auth.speed
+++ b/usr.sbin/xntpd/authstuff/auth.speed
@@ -1,20 +1,33 @@
 Authentication delays (us)	DES	MD5
+-------------------------------------------
+IBM RS6000/990			10	28
+IBM RS6000/590			10	29
+HP 9000/735 hpux9.03 snavely	10	33
 DEC 3000/400 OSF/1 bunnylou	14	35
-HP9000/735 hpux9.0		na	30
-HP9000/730 hpux8.07(+OV)	16	55 
-SGI Indigo R4000		19      48
-HP9000/720 hpux8.07		21	66
+HP 9000/730 hpux8.07(+OV)	16	55
+SGI Indigo R4000		19	48
+HP 9000/720 hpux8.07		21	66
+IBM RS6000/250			20	39
+IBM RS6000/370			21	43
+IBM RS6000/580			22	43
 SGI 4/35			38	110
-DECstation 5000/240 cowbird	39	81	
+DECstation 5000/240 cowbird	39	81
+IBM RS6000/530H			40	83
 Sun4c/75 SS2			43	96
-Sun4c/50 IPX malarky            47      94
-DECstation 5000/33 sundeck      49      106
+Sun4c/50 IPX malarky		47	94
+DECstation 5000/33 sundeck	49	106
+IBM RS6000/530			51	107
 SGI Indigo			54	115
-DECstation 5000/125 herald      63      136
-Sun4c/65 SS1+ pogo              72      159
+DECstation 5000/125 herald	63	136
+IBM RS6000/320			69	139
+Sun4c/65 SS1+ pogo		72	159
 Sun4c/40 IPC grundoon		73	163
 Sun4c/60 SS1 albert		95	199
 Sun4c/20 SLC			95	203
-DECstation 3100 sheol           98      214
+DECstation 3100 sheol		98	214
 DECstation 2100 circus		126	278
 VAX 780				985	?
+
+Updated 26 April 1994
+David L. Mills
+
diff --git a/usr.sbin/xntpd/authstuff/authcert.c b/usr.sbin/xntpd/authstuff/authcert.c
index 6f6e42c..0f04d61 100644
--- a/usr.sbin/xntpd/authstuff/authcert.c
+++ b/usr.sbin/xntpd/authstuff/authcert.c
@@ -1,4 +1,4 @@
-/* authcert.c,v 3.1 1993/07/06 01:04:52 jbj Exp
+/*
  * This file, and the certdata file, shamelessly stolen
  * from Phil Karn's DES implementation.
  */
@@ -20,44 +20,44 @@ static	void	put8	P((U_LONG *));
 void
 main()
 {
-	U_LONG key[2], plain[2], cipher[2], answer[2];
+	U_LONG key[2], plain[2], cipher[2], answer[2], temp;
 	int i;
 	int test;
 	int fail;
 
-	for(test=0;!feof(stdin);test++){
+	for(test = 0; !feof(stdin); test++){
 		get8(key);
 		DESauth_subkeys(key, ekeys, dkeys);
 		printf(" K: "); put8(key);
-
 		get8(plain);
 		printf(" P: "); put8(plain);
-
 		get8(answer);
 		printf(" C: "); put8(answer);
-
-
-		for(i=0;i<2;i++)
+		for (i = 0; i < 2; i++)
 			cipher[i] = htonl(plain[i]);
 		DESauth_des(cipher, ekeys);
-
-		for(i=0;i<2;i++)
-			if(ntohl(cipher[i]) != answer[i])
+		for (i = 0; i < 2; i++) {
+			temp = ntohl(cipher[i]);
+			if (temp != answer[i])
 				break;
+		}
+
 		fail = 0;
-		if(i != 2){
+		if (i != 2) {
 			printf(" Encrypt FAIL");
 			fail++;
 		}
 		DESauth_des(cipher, dkeys);
-		for(i=0;i<2;i++)
-			if(ntohl(cipher[i]) != plain[i])
+		for (i = 0; i < 2; i++) {
+			temp = ntohl(cipher[i]);
+			if (temp != plain[i])
 				break;
-		if(i != 2){
+		}
+		if (i != 2) {
 			printf(" Decrypt FAIL");
 			fail++;
 		}
-		if(fail == 0)
+		if (fail == 0)
 			printf(" OK");
 		printf("\n");
 	}
@@ -65,32 +65,31 @@ main()
 
 static void
 get8(lp)
-U_LONG *lp;
+	U_LONG *lp;
 {
 	int t;
 	U_LONG l[2];
 	int i;
 
-	l[0] = l[1] = 0L;
-	for(i=0;i<8;i++){
-		scanf("%2x",&t);
-		if(feof(stdin))
+	l[0] = l[1] = 0;
+	for (i = 0; i < 8; i++) {
+		scanf("%2x", &t);
+		if (feof(stdin))
 			exit(0);
-		l[i/4] <<= 8;
-		l[i/4] |= (U_LONG)(t & 0xff);
+		l[i / 4] <<= 8;
+		l[i / 4] |= (U_LONG)(t & 0xff);
 	}
 	*lp = l[0];
-	*(lp+1) = l[1];
+	*(lp + 1) = l[1];
 }
 
 static void
 put8(lp)
-U_LONG *lp;
+	U_LONG *lp;
 {
 	int i;
 
 	
-	for(i=0;i<2;i++){
-		printf("%08x",*lp++);
-	}
+	for(i = 0; i < 2; i++)
+		printf("%08lx", (u_long)(*lp++));
 }
diff --git a/usr.sbin/xntpd/authstuff/authspeed.c b/usr.sbin/xntpd/authstuff/authspeed.c
index ecddbcd..a6362a8 100644
--- a/usr.sbin/xntpd/authstuff/authspeed.c
+++ b/usr.sbin/xntpd/authstuff/authspeed.c
@@ -1,5 +1,5 @@
-/* authspeed.c,v 3.1 1993/07/06 01:04:54 jbj Exp
- * authspeed - figure out how LONG it takes to do an NTP encryption
+/*
+ * authspeed - figure out how long it takes to do an NTP encryption
  */
 
 #if defined(SYS_HPUX) || defined(SYS_AUX3) || defined(SYS_AUX2) || defined(SOLARIS) || defined(SYS_SVR4) || defined(SYS_PTX) || defined(SYS_UNIXWARE1)
@@ -38,7 +38,7 @@ struct rusage rstart, rend;
 #endif
 
 l_fp dummy1, dummy2;
-U_LONG dummy3;
+u_long dummy3;
 
 U_LONG pkt[15];
 
@@ -299,8 +299,8 @@ subtime(tvs, tve, res)
 	struct timeval *tvs, *tve;
 	double *res;
 {
-	LONG sec;
-	LONG usec;
+	long sec;
+	long usec;
 
 	sec = tve->tv_sec - tvs->tv_sec;
 	usec = tve->tv_usec - tvs->tv_usec;
diff --git a/usr.sbin/xntpd/authstuff/keyparity.c b/usr.sbin/xntpd/authstuff/keyparity.c
index 424fade..aed05d9 100644
--- a/usr.sbin/xntpd/authstuff/keyparity.c
+++ b/usr.sbin/xntpd/authstuff/keyparity.c
@@ -1,4 +1,4 @@
-/* keyparity.c,v 3.1 1993/07/06 01:04:57 jbj Exp
+/*
  * keyparity - add parity bits to key and/or change an ascii key to binary
  */
 
@@ -33,9 +33,9 @@ int asciiflag = 0;
 int ntpoutflag = 0;
 int gotoopt = 0;
 
-static	int	parity	P((U_LONG *));
-static	int	decodekey P((int, char *, U_LONG *));
-static	void	output	P((U_LONG *, int));
+static	int	parity	P((u_long *));
+static	int	decodekey P((int, char *, u_long *));
+static	void	output	P((u_long *, int));
 
 /*
  * main - parse arguments and handle options
@@ -48,7 +48,7 @@ char *argv[];
 	int c;
 	int errflg = 0;
 	int keytype;
-	U_LONG key[2];
+	u_long key[2];
 	extern int ntp_optind;
 	extern char *ntp_optarg;
 
@@ -138,9 +138,9 @@ char *argv[];
  */
 static int
 parity(key)
-	U_LONG *key;
+	u_long *key;
 {
-	U_LONG mask;
+	u_long mask;
 	int parity_err;
 	int bitcount;
 	int half;
@@ -193,7 +193,7 @@ static int
 decodekey(keytype, str, key)
 	int keytype;
 	char *str;
-	U_LONG *key;
+	u_long *key;
 {
 	u_char keybytes[8];
 	char *cp;
@@ -225,7 +225,7 @@ decodekey(keytype, str, key)
 			if (xdigit == 0)
 				return 0;
 			key[i>>3] <<= 4;
-			key[i>>3] |= (U_LONG)(xdigit - hex) & 0xf;
+			key[i>>3] |= (u_long)(xdigit - hex) & 0xf;
 		}
 
 		/*
@@ -265,7 +265,7 @@ decodekey(keytype, str, key)
  */
 static void
 output(key, ntpformat)
-	U_LONG *key;
+	u_long *key;
 	int ntpformat;
 {
 	int i;
diff --git a/usr.sbin/xntpd/authstuff/makeIPFP.c b/usr.sbin/xntpd/authstuff/makeIPFP.c
index 50b31f4..8fabdb7 100644
--- a/usr.sbin/xntpd/authstuff/makeIPFP.c
+++ b/usr.sbin/xntpd/authstuff/makeIPFP.c
@@ -1,4 +1,4 @@
-/* makeIPFP.c,v 3.1 1993/07/06 01:04:58 jbj Exp
+/*
  * makeIPFP - make fast DES IP and FP tables
  */
 
@@ -9,13 +9,13 @@
 
 #define	STREQ(a, b)	(*(a) == *(b) && strcmp((a), (b)) == 0)
 
-U_LONG IPL[256];
-U_LONG FPL[256];
+u_long IPL[256];
+u_long FPL[256];
 
 char *progname;
 int debug;
 
-static	void	perm	P((u_char *, u_char *, U_LONG *, U_LONG *));
+static	void	perm	P((u_char *, u_char *, u_long *, u_long *));
 static	void	doit	P((void));
 
 /*
@@ -138,11 +138,11 @@ static void
 perm(databits, permtab, leftp, rightp)
 	u_char *databits;
 	u_char *permtab;
-	U_LONG *leftp;
-	U_LONG *rightp;
+	u_long *leftp;
+	u_long *rightp;
 {
-	register U_LONG left;
-	register U_LONG right;
+	register u_long left;
+	register u_long right;
 	register u_char *PT;
 	register u_char *bits;
 	register int i;
@@ -175,8 +175,8 @@ static void
 doit()
 {
 	u_char bits[64];
-	U_LONG left;
-	U_LONG right;
+	u_long left;
+	u_long right;
 	int tabno;
 	int i;
 	int ind0, ind1, ind2, ind3;
@@ -190,7 +190,7 @@ doit()
 	 * this as well as printing them.  Note that this is the
 	 * left-half table, the right half table will be identical.
 	 */
-	printf("static U_LONG IP[256] = {");
+	printf("static u_long IP[256] = {");
 	for (tabno = 0; tabno < 4; tabno++) {
 		i = tabno * 8;
 		ind7 = IPLbits[i] - 1;
@@ -258,7 +258,7 @@ doit()
 	/*
 	 * Next is the FP table, in big endian order
 	 */
-	printf("#if BYTE_ORDER == LITTLE_ENDIAN\nstatic U_LONG FP[256] = {");
+	printf("#if BYTE_ORDER == LITTLE_ENDIAN\nstatic u_long FP[256] = {");
 	for (tabno = 3; tabno >= 0; tabno--) {
 		i = tabno * 8;
 		ind7 = FPLbits[i] - 1;
@@ -327,7 +327,7 @@ doit()
 	 * Now reouput the FP table in order appropriate for little
 	 * endian machines
 	 */
-	printf("#else\nstatic U_LONG FP[256] = {");
+	printf("#else\nstatic u_long FP[256] = {");
 	for (octbits = 0; octbits < 256; octbits++) {
 		left = ((FPL[octbits] >> 24) & 0x000000ff)
 		     | ((FPL[octbits] >>  8) & 0x0000ff00)
diff --git a/usr.sbin/xntpd/authstuff/makePC1.c b/usr.sbin/xntpd/authstuff/makePC1.c
index 337353c..8a49ec9 100644
--- a/usr.sbin/xntpd/authstuff/makePC1.c
+++ b/usr.sbin/xntpd/authstuff/makePC1.c
@@ -1,4 +1,4 @@
-/* makePC1.c,v 3.1 1993/07/06 01:04:59 jbj Exp
+/*
  * makePC1 - build custom permutted choice 1 tables
  */
 
@@ -12,7 +12,7 @@
 char *progname;
 int debug;
 
-static	void	permute	P((u_char *, U_LONG *, U_LONG *));
+static	void	permute	P((u_char *, u_long *, u_long *));
 static	void	doit	P((void));
 
 /*
@@ -74,11 +74,11 @@ static u_char PC1_D[28] = {
 static void
 permute(bits, cp, dp)
 	u_char *bits;
-	U_LONG *cp;
-	U_LONG *dp;
+	u_long *cp;
+	u_long *dp;
 {
 	register int i;
-	register U_LONG mask;
+	register u_long mask;
 	u_char c[28];
 	u_char d[28];
 
@@ -122,10 +122,10 @@ static	int	rc4[4] = { 32, 40, 48, 56 };
  */
 static	int	rd3[4] = { 36, 44, 52, 60 };
 
-static	U_LONG	PC_CL[8];
-static	U_LONG	PC_DL[16];
-static	U_LONG	PC_CR[16];
-static	U_LONG	PC_DR[8];
+static	u_long	PC_CL[8];
+static	u_long	PC_DL[16];
+static	u_long	PC_CR[16];
+static	u_long	PC_DR[8];
 
 
 /*
@@ -136,13 +136,13 @@ doit()
 {
 	int i;
 	int comb;
-	U_LONG c;
-	U_LONG d;
+	u_long c;
+	u_long d;
 	u_char bits[64];
 
 	memset((char *)bits, 0, sizeof bits);
 
-	printf("static U_LONG PC1_CL[8] = {");
+	printf("static u_long PC1_CL[8] = {");
 	for (i = 0; i < 4; i++) {
 		for (comb = 0; comb < 8; comb++) {
 			if (comb & 0x4)
@@ -176,7 +176,7 @@ doit()
 		}
 	}
 
-	printf("static U_LONG PC1_DL[16] = {");
+	printf("static u_long PC1_DL[16] = {");
 	for (i = 0; i < 4; i++) {
 		for (comb = 0; comb < 16; comb++) {
 			if (comb & 0x8)
@@ -213,7 +213,7 @@ doit()
 		}
 	}
 
-	printf("static U_LONG PC1_CR[16] = {");
+	printf("static u_long PC1_CR[16] = {");
 	for (i = 0; i < 4; i++) {
 		for (comb = 0; comb < 16; comb++) {
 			if (comb & 0x8)
@@ -250,7 +250,7 @@ doit()
 		}
 	}
 
-	printf("static U_LONG PC1_DR[8] = {");
+	printf("static u_long PC1_DR[8] = {");
 	for (i = 0; i < 4; i++) {
 		for (comb = 0; comb < 8; comb++) {
 			if (comb & 0x4)
diff --git a/usr.sbin/xntpd/authstuff/makePC2.c b/usr.sbin/xntpd/authstuff/makePC2.c
index 9795b62..e5121fd 100644
--- a/usr.sbin/xntpd/authstuff/makePC2.c
+++ b/usr.sbin/xntpd/authstuff/makePC2.c
@@ -1,4 +1,4 @@
-/* makePC2.c,v 3.1 1993/07/06 01:05:01 jbj Exp
+/*
  * makePC2 - build custom permutted choice 2 tables
  */
 
@@ -12,8 +12,8 @@
 char *progname;
 int debug;
 
-static	void	permc	P((u_char *, U_LONG *));
-static	void	permd	P((u_char *, U_LONG *));
+static	void	permc	P((u_char *, u_long *));
+static	void	permd	P((u_char *, u_long *));
 static	void	doit	P((void));
 
 /*
@@ -71,7 +71,7 @@ static u_char PC2_D[24] = {
 	17, 13, 21,  7,  0,  3
 };
 
-U_LONG masks[4] = { 0x40000000, 0x400000, 0x4000, 0x40 };
+u_long masks[4] = { 0x40000000, 0x400000, 0x4000, 0x40 };
 
 
 /*
@@ -80,11 +80,11 @@ U_LONG masks[4] = { 0x40000000, 0x400000, 0x4000, 0x40 };
 static void
 permc(bits, resp)
 	u_char *bits;
-	U_LONG *resp;
+	u_long *resp;
 {
 	register int part;
 	register int i;
-	register U_LONG mask;
+	register u_long mask;
 	u_char res[24];
 
 	memset((char *)res, 0, sizeof res);
@@ -110,11 +110,11 @@ permc(bits, resp)
 static void
 permd(bits, resp)
 	u_char *bits;
-	U_LONG *resp;
+	u_long *resp;
 {
 	register int part;
 	register int i;
-	register U_LONG mask;
+	register u_long mask;
 	u_char res[24];
 
 	memset((char *)res, 0, sizeof res);
@@ -165,12 +165,12 @@ doit()
 {
 	int i;
 	int comb;
-	U_LONG res;
+	u_long res;
 	u_char bits[28];
 
 	memset((char *)bits, 0, sizeof bits);
 
-	printf("static U_LONG PC2_C[4][64] = {");
+	printf("static u_long PC2_C[4][64] = {");
 	for (i = 0; i < 4; i++) {
 		for (comb = 0; comb < 64; comb++) {
 			if (comb & 0x20)
@@ -203,7 +203,7 @@ doit()
 		}
 	}
 
-	printf("static U_LONG PC2_D[4][64] = {");
+	printf("static u_long PC2_D[4][64] = {");
 	for (i = 0; i < 4; i++) {
 		for (comb = 0; comb < 64; comb++) {
 			if (comb & 0x20)
diff --git a/usr.sbin/xntpd/authstuff/makeSP.c b/usr.sbin/xntpd/authstuff/makeSP.c
index 7bfd93e..4fcd78c 100644
--- a/usr.sbin/xntpd/authstuff/makeSP.c
+++ b/usr.sbin/xntpd/authstuff/makeSP.c
@@ -1,4 +1,4 @@
-/* makeSP.c,v 3.1 1993/07/06 01:05:02 jbj Exp
+/*
  * makeSP - build combination S and P tables for quick DES computation
  */
 
@@ -12,7 +12,7 @@
 char *progname;
 int debug;
 
-static	void	selperm	P((int, int, U_LONG *));
+static	void	selperm	P((int, int, u_long *));
 static	void	doit	P((void));
 
 /*
@@ -116,15 +116,15 @@ u_char bits[32];
 
 /*
  * selperm - run six bit data through the given selection table, then
- *           through the PT table to produce a LONG output.
+ *           through the PT table to produce a long output.
  */
 static void
 selperm(selnumber, sixbits, resp)
 	int selnumber;
 	int sixbits;
-	U_LONG *resp;
+	u_long *resp;
 {
-	register U_LONG res;
+	register u_long res;
 	register int selno;
 	register int i;
 	register int ind;
@@ -162,11 +162,11 @@ static void
 doit()
 {
 	int selno;
-	U_LONG result;
+	u_long result;
 	int sixbits;
 
 	memset((char *)bits, 0, sizeof bits);
-	printf("static U_LONG SP[8][64] = {");
+	printf("static u_long SP[8][64] = {");
 	for (selno = 0; selno < 8; selno++) {
 		for (sixbits = 0; sixbits < 64; sixbits++) {
 			selperm(selno, sixbits, &result);
diff --git a/usr.sbin/xntpd/authstuff/mkrandkeys.c b/usr.sbin/xntpd/authstuff/mkrandkeys.c
index 454b341..0edf733 100644
--- a/usr.sbin/xntpd/authstuff/mkrandkeys.c
+++ b/usr.sbin/xntpd/authstuff/mkrandkeys.c
@@ -1,4 +1,4 @@
-/* mkrandkeys.c,v 3.1 1993/07/06 01:05:08 jbj Exp
+/*
  * mkrandkeys - make a key file for xntpd with some quite random keys
  */
 #include <stdio.h>
@@ -12,12 +12,12 @@
 char *progname;
 int debug;
 
-U_LONG keydata[2];
+u_long keydata[2];
 
 int std = 1;		/* DES standard key format */
 u_char dokey[16] = { 0 };
 
-static	void	rand_data	P((U_LONG *));
+static	void	rand_data	P((u_long *));
 
 /*
  * main - parse arguments and handle options
@@ -32,7 +32,7 @@ char *argv[];
 	int j;
 	int errflg = 0;
 	int numkeys;
-	U_LONG tmp;
+	u_long tmp;
 	char *passwd;
 	extern int ntp_optind;
 	extern char *ntp_optarg;
@@ -89,7 +89,7 @@ char *argv[];
 
 	keydata[0] = keydata[1] = 0;
 	for (i = 0; i < 8 && *passwd != '\0'; i++) {
-		keydata[i/4] |= ((((U_LONG)(*passwd))&0xff)<<(1+((3-(i%4))*8)));
+		keydata[i/4] |= ((((u_long)(*passwd))&0xff)<<(1+((3-(i%4))*8)));
 		passwd++;
 	}
 
@@ -139,18 +139,18 @@ char *volatile_file[] = {
 
 static void
 rand_data(data)
-	U_LONG *data;
+	u_long *data;
 {
 	register i;
 	struct stat buf;
-	extern LONG time();
+	extern long time();
 	char ekeys[128], dkeys[128];
 
 	*data ^= 0x9662f394;
 	*(data+1) ^= 0x9f17c55f;
 	DESauth_subkeys(data, ekeys, dkeys);
 	*data ^= NEXT(getpid() + (getuid() << 16));
-	*(data+1) ^= NEXT(time((LONG *)0));
+	*(data+1) ^= NEXT(time((long *)0));
 	DESauth_des(data, ekeys);
 	for (i = 0; strlen(volatile_file[i]); i++) {
 		if (stat(volatile_file[i], &buf) == -1)
diff --git a/usr.sbin/xntpd/authstuff/omakeIPFP.c b/usr.sbin/xntpd/authstuff/omakeIPFP.c
index 0751a5d..92d87be 100644
--- a/usr.sbin/xntpd/authstuff/omakeIPFP.c
+++ b/usr.sbin/xntpd/authstuff/omakeIPFP.c
@@ -1,4 +1,4 @@
-/* omakeIPFP.c,v 3.1 1993/07/06 01:05:10 jbj Exp
+/*
  * makeIPFP - make fast DES IP and FP tables
  *
  * This is an older version which generated tables half the size of
@@ -15,13 +15,13 @@
 
 #define	STREQ(a, b)	(*(a) == *(b) && strcmp((a), (b)) == 0)
 
-U_LONG IPL[8][16];
-U_LONG FPL[8][16];
+u_long IPL[8][16];
+u_long FPL[8][16];
 
 char *progname;
 int debug;
 
-static	void	perm	P((u_char *, u_char *, U_LONG *, U_LONG *));
+static	void	perm	P((u_char *, u_char *, u_long *, u_long *));
 static	void	doit	P((void));
 
 /*
@@ -144,11 +144,11 @@ static void
 perm(databits, permtab, leftp, rightp)
 	u_char *databits;
 	u_char *permtab;
-	U_LONG *leftp;
-	U_LONG *rightp;
+	u_long *leftp;
+	u_long *rightp;
 {
-	register U_LONG left;
-	register U_LONG right;
+	register u_long left;
+	register u_long right;
 	register u_char *PT;
 	register u_char *bits;
 	register int i;
@@ -181,8 +181,8 @@ static void
 doit()
 {
 	u_char bits[64];
-	U_LONG left;
-	U_LONG right;
+	u_long left;
+	u_long right;
 	int tabno;
 	int i;
 	int ind0, ind1, ind2, ind3;
@@ -195,7 +195,7 @@ doit()
 	 * this as well as printing them.  Note that this is the
 	 * left-half table.
 	 */
-	printf("static U_LONG IP[8][16] = {");
+	printf("static u_long IP[8][16] = {");
 	for (tabno = 0; tabno < 8; tabno++) {
 		i = tabno * 4;
 		ind3 = IPLbits[i] - 1;
@@ -279,7 +279,7 @@ doit()
 	/*
 	 * Next are the FP tables
 	 */
-	printf("static U_LONG FP[8][16] = {");
+	printf("static u_long FP[8][16] = {");
 	for (tabno = 0; tabno < 8; tabno++) {
 		i = tabno * 4;
 		ind3 = FPLbits[i] - 1;
diff --git a/usr.sbin/xntpd/authstuff/unixcert.c b/usr.sbin/xntpd/authstuff/unixcert.c
index 36234b1..47c76f6 100644
--- a/usr.sbin/xntpd/authstuff/unixcert.c
+++ b/usr.sbin/xntpd/authstuff/unixcert.c
@@ -1,4 +1,4 @@
-/* unixcert.c,v 3.1 1993/07/06 01:05:14 jbj Exp
+/*
  * This file, and the certdata file, shamelessly stolen
  * from Phil Karn's DES implementation.
  *