MFV ntp 4.2.8p2 (r281348)

Reviewed by:    delphij (suggested MFC)
Approved by:	roberto
Security:       CVE-2015-1798, CVE-2015-1799
Security:       VuXML ebd84c96-dd7e-11e4-854e-3c970e169bc2
MFC after:	1 month

13 files changed, 57 insertions, 439 deletions

diff --git a/contrib/ntp/util/Makefile.am b/contrib/ntp/util/Makefile.am
index 88bf7cb..8a47a3c 100644
--- a/contrib/ntp/util/Makefile.am
+++ b/contrib/ntp/util/Makefile.am
@@ -112,7 +112,7 @@ $(srcdir)/ntp-keygen.html: $(srcdir)/ntp-keygen.texi $(top_srcdir)/sntp/include/
 	cd $(srcdir) && ( makeinfo --force --html --no-split -o ntp-keygen.html ntp-keygen.texi || true )
 
 
-jitter_SOURCES=	jitter.c jitter.h
+jitter_SOURCES=	jitter.c
 jitter_LDADD=
 
 kern.o: kern.c
diff --git a/contrib/ntp/util/Makefile.in b/contrib/ntp/util/Makefile.in
index 0325e44..f4fc712 100644
--- a/contrib/ntp/util/Makefile.in
+++ b/contrib/ntp/util/Makefile.in
@@ -52,8 +52,7 @@ subdir = util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
-	$(top_srcdir)/sntp/libevent/m4/openldap-thread-check.m4 \
-	$(top_srcdir)/sntp/libevent/m4/openldap.m4 \
+	$(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \
 	$(top_srcdir)/sntp/m4/define_dir.m4 \
 	$(top_srcdir)/sntp/m4/hms_search_lib.m4 \
 	$(top_srcdir)/sntp/m4/libtool.m4 \
@@ -82,6 +81,8 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
+	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
+	$(top_srcdir)/sntp/m4/openldap.m4 \
 	$(top_srcdir)/sntp/m4/os_cflags.m4 \
 	$(top_srcdir)/sntp/m4/snprintf.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
@@ -436,6 +437,11 @@ TIMETRIM_DL = @TIMETRIM_DL@
 TIMETRIM_DS = @TIMETRIM_DS@
 TIMETRIM_MS = @TIMETRIM_MS@
 TIMETRIM_NI = @TIMETRIM_NI@
+UPDATE_LEAP_DB = @UPDATE_LEAP_DB@
+UPDATE_LEAP_DL = @UPDATE_LEAP_DL@
+UPDATE_LEAP_DS = @UPDATE_LEAP_DS@
+UPDATE_LEAP_MS = @UPDATE_LEAP_MS@
+UPDATE_LEAP_NI = @UPDATE_LEAP_NI@
 VERSION = @VERSION@
 VER_SUFFIX = @VER_SUFFIX@
 YACC = @YACC@
@@ -554,7 +560,7 @@ std_def_list = \
 	$(top_srcdir)/sntp/include/version.def			\
 	$(NULL)
 
-jitter_SOURCES = jitter.c jitter.h
+jitter_SOURCES = jitter.c
 jitter_LDADD = 
 NTP_INCS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
 	-I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
diff --git a/contrib/ntp/util/invoke-ntp-keygen.texi b/contrib/ntp/util/invoke-ntp-keygen.texi
index 808757d..0412485 100644
--- a/contrib/ntp/util/invoke-ntp-keygen.texi
+++ b/contrib/ntp/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 #
-# It has been AutoGen-ed  February  4, 2015 at 02:43:59 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  April  7, 2015 at 04:27:46 AM by AutoGen 5.18.5pre4
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -886,7 +886,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/contrib/ntp/util/jitter.c b/contrib/ntp/util/jitter.c
index 62a84ad..c0050fc 100644
--- a/contrib/ntp/util/jitter.c
+++ b/contrib/ntp/util/jitter.c
@@ -14,10 +14,9 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <stdlib.h>
-#include "jitter.h"
+#include "ntp_fp.h"
 
 #define NBUF	800002
-#define FRAC	4294967296.		/* a bbbbillion */
 #define JAN_1970 2208988800UL		/* Unix base epoch */
 #define CLOCK_GETTIME			/* Solaris hires clock */
 
diff --git a/contrib/ntp/util/jitter.h b/contrib/ntp/util/jitter.h
deleted file mode 100644
index 1431406..0000000
--- a/contrib/ntp/util/jitter.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- *  ntp_types.h - defines how int32 and u_int32 are treated.
- *  For 64 bit systems like the DEC Alpha, they have to be defined
- *  as int and u_int.
- *  For 32 bit systems, define them as long and u_long
- */
-#define SIZEOF_INT 4
-
-/*
- * VMS DECC (v4.1), {u_char,u_short,u_long} are only in SOCKET.H,
- *                      and u_int isn't defined anywhere
- */
-#if defined(VMS)
-#include <socket.h>
-typedef unsigned int u_int;
-/*
- * Note: VMS DECC has  long == int  (even on __alpha),
- *       so the distinction below doesn't matter
- */
-#endif /* VMS */
-
-#if (SIZEOF_INT == 4)
-# ifndef int32
-#  define int32 int
-# endif
-# ifndef u_int32
-#  define u_int32 unsigned int
-# endif
-#else /* not sizeof(int) == 4 */
-# if (SIZEOF_LONG == 4)
-# else /* not sizeof(long) == 4 */
-#  ifndef int32
-#   define int32 long
-#  endif
-#  ifndef u_int32
-#   define u_int32 unsigned long
-#  endif
-# endif /* not sizeof(long) == 4 */
-# include "Bletch: what's 32 bits on this machine?"
-#endif /* not sizeof(int) == 4 */
-
-typedef unsigned short associd_t; /* association ID */
-typedef u_int32 keyid_t;        /* cryptographic key ID */
-typedef u_int32 tstamp_t;       /* NTP seconds timestamp */
-
-/*
- * NTP uses two fixed point formats.  The first (l_fp) is the "long"
- * format and is 64 bits long with the decimal between bits 31 and 32.
- * This is used for time stamps in the NTP packet header (in network
- * byte order) and for internal computations of offsets (in local host
- * byte order). We use the same structure for both signed and unsigned
- * values, which is a big hack but saves rewriting all the operators
- * twice. Just to confuse this, we also sometimes just carry the
- * fractional part in calculations, in both signed and unsigned forms.
- * Anyway, an l_fp looks like:
- *
- *    0			  1		      2			  3
- *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |			       Integral Part			     |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |			       Fractional Part			     |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- */
-typedef struct {
-	union {
-		u_int32 Xl_ui;
-		int32 Xl_i;
-	} Ul_i;
-	union {
-		u_int32 Xl_uf;
-		int32 Xl_f;
-	} Ul_f;
-} l_fp;
-
-#define l_ui	Ul_i.Xl_ui		/* unsigned integral part */
-#define	l_i	Ul_i.Xl_i		/* signed integral part */
-#define	l_uf	Ul_f.Xl_uf		/* unsigned fractional part */
-#define	l_f	Ul_f.Xl_f		/* signed fractional part */
-
-/*
- * Fractional precision (of an l_fp) is actually the number of
- * bits in a long.
- */
-#define	FRACTION_PREC	(32)
-
-
-/*
- * The second fixed point format is 32 bits, with the decimal between
- * bits 15 and 16.  There is a signed version (s_fp) and an unsigned
- * version (u_fp).  This is used to represent synchronizing distance
- * and synchronizing dispersion in the NTP packet header (again, in
- * network byte order) and internally to hold both distance and
- * dispersion values (in local byte order).  In network byte order
- * it looks like:
- *
- *    0			  1		      2			  3
- *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |		  Integer Part	     |	   Fraction Part	     |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- */
-typedef int32 s_fp;
-typedef u_int32 u_fp;
-
-/*
- * A unit second in fp format.  Actually 2**(half_the_bits_in_a_long)
- */
-#define	FP_SECOND	(0x10000)
-
-/*
- * Byte order conversions
- */
-#define	HTONS_FP(x)	(htonl(x))
-#define	HTONL_FP(h, n)	do { (n)->l_ui = htonl((h)->l_ui); \
-			     (n)->l_uf = htonl((h)->l_uf); } while (0)
-#define	NTOHS_FP(x)	(ntohl(x))
-#define	NTOHL_FP(n, h)	do { (h)->l_ui = ntohl((n)->l_ui); \
-			     (h)->l_uf = ntohl((n)->l_uf); } while (0)
-#define	NTOHL_MFP(ni, nf, hi, hf) \
-	do { (hi) = ntohl(ni); (hf) = ntohl(nf); } while (0)
-#define	HTONL_MFP(hi, hf, ni, nf) \
-	do { (ni) = ntohl(hi); (nf) = ntohl(hf); } while (0)
-
-/* funny ones.  Converts ts fractions to net order ts */
-#define	HTONL_UF(uf, nts) \
-	do { (nts)->l_ui = 0; (nts)->l_uf = htonl(uf); } while (0)
-#define	HTONL_F(f, nts) do { (nts)->l_uf = htonl(f); \
-				if ((f) & 0x80000000) \
-					(nts)->l_i = -1; \
-				else \
-					(nts)->l_i = 0; \
-			} while (0)
-
-/*
- * Conversions between the two fixed point types
- */
-#define	MFPTOFP(x_i, x_f)	(((int)(x_i) >= 0x00010000) ? 0x7fffffff : \
-				(((int)(x_i) <= -0x00010000) ? 0x80000000 : \
-				(u_int)(((x_i)<<16) | (((x_f)>>16)&0xffff))))
-#define	LFPTOFP(v)		MFPTOFP((v)->l_i, (v)->l_f)
-
-#define UFPTOLFP(x, v) ((v)->l_ui = (u_fp)(x)>>16, (v)->l_uf = (x)<<16)
-#define FPTOLFP(x, v)  (UFPTOLFP((x), (v)), (x) < 0 ? (v)->l_ui -= 0x10000 : 0)
-
-#define MAXLFP(v) ((v)->l_ui = 0x7fffffff, (v)->l_uf = 0xffffffff)
-#define MINLFP(v) ((v)->l_ui = 0x80000000, (v)->l_uf = 0)
-
-/*
- * Primitive operations on long fixed point values.  If these are
- * reminiscent of assembler op codes it's only because some may
- * be replaced by inline assembler for particular machines someday.
- * These are the (kind of inefficient) run-anywhere versions.
- */
-#define	M_NEG(v_i, v_f) 	/* v = -v */ \
-	do { \
-		if ((v_f) == 0) \
-			(v_i) = -((s_fp)(v_i)); \
-		else { \
-			(v_f) = -((s_fp)(v_f)); \
-			(v_i) = ~(v_i); \
-		} \
-	} while(0)
-
-#define	M_NEGM(r_i, r_f, a_i, a_f) 	/* r = -a */ \
-	do { \
-		if ((a_f) == 0) { \
-			(r_f) = 0; \
-			(r_i) = -(a_i); \
-		} else { \
-			(r_f) = -(a_f); \
-			(r_i) = ~(a_i); \
-		} \
-	} while(0)
-
-#define M_ADD(r_i, r_f, a_i, a_f) 	/* r += a */ \
-	do { \
-		register u_int32 lo_tmp; \
-		register u_int32 hi_tmp; \
-		\
-		lo_tmp = ((r_f) & 0xffff) + ((a_f) & 0xffff); \
-		hi_tmp = (((r_f) >> 16) & 0xffff) + (((a_f) >> 16) & 0xffff); \
-		if (lo_tmp & 0x10000) \
-			hi_tmp++; \
-		(r_f) = ((hi_tmp & 0xffff) << 16) | (lo_tmp & 0xffff); \
-		\
-		(r_i) += (a_i); \
-		if (hi_tmp & 0x10000) \
-			(r_i)++; \
-	} while (0)
-
-#define M_ADD3(r_ovr, r_i, r_f, a_ovr, a_i, a_f) /* r += a, three word */ \
-	do { \
-		register u_int32 lo_tmp; \
-		register u_int32 hi_tmp; \
-		\
-		lo_tmp = ((r_f) & 0xffff) + ((a_f) & 0xffff); \
-		hi_tmp = (((r_f) >> 16) & 0xffff) + (((a_f) >> 16) & 0xffff); \
-		if (lo_tmp & 0x10000) \
-			hi_tmp++; \
-		(r_f) = ((hi_tmp & 0xffff) << 16) | (lo_tmp & 0xffff); \
-		\
-		lo_tmp = ((r_i) & 0xffff) + ((a_i) & 0xffff); \
-		if (hi_tmp & 0x10000) \
-			lo_tmp++; \
-		hi_tmp = (((r_i) >> 16) & 0xffff) + (((a_i) >> 16) & 0xffff); \
-		if (lo_tmp & 0x10000) \
-			hi_tmp++; \
-		(r_i) = ((hi_tmp & 0xffff) << 16) | (lo_tmp & 0xffff); \
-		\
-		(r_ovr) += (a_ovr); \
-		if (hi_tmp & 0x10000) \
-			(r_ovr)++; \
-	} while (0)
-
-#define M_SUB(r_i, r_f, a_i, a_f)	/* r -= a */ \
-	do { \
-		register u_int32 lo_tmp; \
-		register u_int32 hi_tmp; \
-		\
-		if ((a_f) == 0) { \
-			(r_i) -= (a_i); \
-		} else { \
-			lo_tmp = ((r_f) & 0xffff) + ((-((s_fp)(a_f))) & 0xffff); \
-			hi_tmp = (((r_f) >> 16) & 0xffff) \
-			    + (((-((s_fp)(a_f))) >> 16) & 0xffff); \
-			if (lo_tmp & 0x10000) \
-				hi_tmp++; \
-			(r_f) = ((hi_tmp & 0xffff) << 16) | (lo_tmp & 0xffff); \
-			\
-			(r_i) += ~(a_i); \
-			if (hi_tmp & 0x10000) \
-				(r_i)++; \
-		} \
-	} while (0)
-
-#define	M_RSHIFTU(v_i, v_f)		/* v >>= 1, v is unsigned */ \
-	do { \
-		(v_f) = (u_int32)(v_f) >> 1; \
-		if ((v_i) & 01) \
-			(v_f) |= 0x80000000; \
-		(v_i) = (u_int32)(v_i) >> 1; \
-	} while (0)
-
-#define	M_RSHIFT(v_i, v_f)		/* v >>= 1, v is signed */ \
-	do { \
-		(v_f) = (u_int32)(v_f) >> 1; \
-		if ((v_i) & 01) \
-			(v_f) |= 0x80000000; \
-		if ((v_i) & 0x80000000) \
-			(v_i) = ((v_i) >> 1) | 0x80000000; \
-		else \
-			(v_i) = (v_i) >> 1; \
-	} while (0)
-
-#define	M_LSHIFT(v_i, v_f)		/* v <<= 1 */ \
-	do { \
-		(v_i) <<= 1; \
-		if ((v_f) & 0x80000000) \
-			(v_i) |= 0x1; \
-		(v_f) <<= 1; \
-	} while (0)
-
-#define	M_LSHIFT3(v_ovr, v_i, v_f)	/* v <<= 1, with overflow */ \
-	do { \
-		(v_ovr) <<= 1; \
-		if ((v_i) & 0x80000000) \
-			(v_ovr) |= 0x1; \
-		(v_i) <<= 1; \
-		if ((v_f) & 0x80000000) \
-			(v_i) |= 0x1; \
-		(v_f) <<= 1; \
-	} while (0)
-
-#define	M_ADDUF(r_i, r_f, uf) 		/* r += uf, uf is u_int32 fraction */ \
-	M_ADD((r_i), (r_f), 0, (uf))	/* let optimizer worry about it */
-
-#define	M_SUBUF(r_i, r_f, uf)		/* r -= uf, uf is u_int32 fraction */ \
-	M_SUB((r_i), (r_f), 0, (uf))	/* let optimizer worry about it */
-
-#define	M_ADDF(r_i, r_f, f)		/* r += f, f is a int32 fraction */ \
-	do { \
-		if ((f) > 0) \
-			M_ADD((r_i), (r_f), 0, (f)); \
-		else if ((f) < 0) \
-			M_ADD((r_i), (r_f), (-1), (f));\
-	} while(0)
-
-#define	M_ISNEG(v_i, v_f) 		/* v < 0 */ \
-	(((v_i) & 0x80000000) != 0)
-
-#define	M_ISHIS(a_i, a_f, b_i, b_f)	/* a >= b unsigned */ \
-	(((u_int32)(a_i)) > ((u_int32)(b_i)) || \
-	  ((a_i) == (b_i) && ((u_int32)(a_f)) >= ((u_int32)(b_f))))
-
-#define	M_ISGEQ(a_i, a_f, b_i, b_f)	/* a >= b signed */ \
-	(((int32)(a_i)) > ((int32)(b_i)) || \
-	  ((a_i) == (b_i) && ((u_int32)(a_f)) >= ((u_int32)(b_f))))
-
-#define	M_ISEQU(a_i, a_f, b_i, b_f)	/* a == b unsigned */ \
-	((a_i) == (b_i) && (a_f) == (b_f))
-
-/*
- * Operations on the long fp format
- */
-#define	L_ADD(r, a)	M_ADD((r)->l_ui, (r)->l_uf, (a)->l_ui, (a)->l_uf)
-#define	L_SUB(r, a)	M_SUB((r)->l_ui, (r)->l_uf, (a)->l_ui, (a)->l_uf)
-#define	L_NEG(v)	M_NEG((v)->l_ui, (v)->l_uf)
-#define L_ADDUF(r, uf)	M_ADDUF((r)->l_ui, (r)->l_uf, (uf))
-#define L_SUBUF(r, uf)	M_SUBUF((r)->l_ui, (r)->l_uf, (uf))
-#define	L_ADDF(r, f)	M_ADDF((r)->l_ui, (r)->l_uf, (f))
-#define	L_RSHIFT(v)	M_RSHIFT((v)->l_i, (v)->l_uf)
-#define	L_RSHIFTU(v)	M_RSHIFT((v)->l_ui, (v)->l_uf)
-#define	L_LSHIFT(v)	M_LSHIFT((v)->l_ui, (v)->l_uf)
-#define	L_CLR(v)	((v)->l_ui = (v)->l_uf = 0)
-
-#define	L_ISNEG(v)	(((v)->l_ui & 0x80000000) != 0)
-#define L_ISZERO(v)	((v)->l_ui == 0 && (v)->l_uf == 0)
-#define	L_ISHIS(a, b)	((a)->l_ui > (b)->l_ui || \
-			  ((a)->l_ui == (b)->l_ui && (a)->l_uf >= (b)->l_uf))
-#define	L_ISGEQ(a, b)	((a)->l_i > (b)->l_i || \
-			  ((a)->l_i == (b)->l_i && (a)->l_uf >= (b)->l_uf))
-#define	L_ISEQU(a, b)	M_ISEQU((a)->l_ui, (a)->l_uf, (b)->l_ui, (b)->l_uf)
-
-/*
- * s_fp/double and u_fp/double conversions
- */
-#define FRIC		65536.	 		/* 2^16 as a double */
-#define DTOFP(r)	((s_fp)((r) * FRIC))
-#define DTOUFP(r)	((u_fp)((r) * FRIC))
-#define FPTOD(r)	((double)(r) / FRIC)
-
-/*
- * l_fp/double conversions
- */
-#define FRAC		4294967296. 		/* 2^32 as a double */
-#define M_DTOLFP(d, r_i, r_uf) 			/* double to l_fp */ \
-	do { \
-		register double d_tmp; \
-		\
-		d_tmp = (d); \
-		if (d_tmp < 0) { \
-			d_tmp = -d_tmp; \
-			(r_i) = (int32)(d_tmp); \
-			(r_uf) = (u_int32)(((d_tmp) - (double)(r_i)) * FRAC); \
-			M_NEG((r_i), (r_uf)); \
-		} else { \
-			(r_i) = (int32)(d_tmp); \
-			(r_uf) = (u_int32)(((d_tmp) - (double)(r_i)) * FRAC); \
-		} \
-	} while (0)
-#define M_LFPTOD(r_i, r_uf, d) 			/* l_fp to double */ \
-	do { \
-		register l_fp l_tmp; \
-		\
-		l_tmp.l_i = (r_i); \
-		l_tmp.l_f = (r_uf); \
-		if (l_tmp.l_i < 0) { \
-			M_NEG(l_tmp.l_i, l_tmp.l_uf); \
-			(d) = -((double)l_tmp.l_i + ((double)l_tmp.l_uf) / FRAC); \
-		} else { \
-			(d) = (double)l_tmp.l_i + ((double)l_tmp.l_uf) / FRAC; \
-		} \
-	} while (0)
-#define DTOLFP(d, v) 	M_DTOLFP((d), (v)->l_ui, (v)->l_uf)
-#define LFPTOD(v, d) 	M_LFPTOD((v)->l_ui, (v)->l_uf, (d))
-
-/*
- * Prototypes
- */
-#if 0
-extern	char *	dofptoa		(u_fp, int, short, int);
-extern	char *	dolfptoa	(u_long, u_long, int, short, int);
-#endif
-
-extern	int	atolfp		(const char *, l_fp *);
-extern	int	buftvtots	(const char *, l_fp *);
-extern	char *	fptoa		(s_fp, short);
-extern	char *	fptoms		(s_fp, short);
-extern	int	hextolfp	(const char *, l_fp *);
-extern  void    gpstolfp        (int, int, unsigned long, l_fp *);
-extern	int	mstolfp		(const char *, l_fp *);
-extern	char *	prettydate	(l_fp *);
-extern	char *	gmprettydate	(l_fp *);
-extern	char *	uglydate	(l_fp *);
-extern  void    mfp_mul         (int32 *, u_int32 *, int32, u_int32, int32, u_int32);
-
-extern	void	get_systime	(l_fp *);
-extern	int	step_systime	(double);
-extern	int	adj_systime	(double);
-
-#define	lfptoa(_fpv, _ndec)	mfptoa((_fpv)->l_ui, (_fpv)->l_uf, (_ndec))
-#define	lfptoms(_fpv, _ndec)	mfptoms((_fpv)->l_ui, (_fpv)->l_uf, (_ndec))
-
-#define	ufptoa(_fpv, _ndec)	dofptoa((_fpv), 0, (_ndec), 0)
-#define	ufptoms(_fpv, _ndec)	dofptoa((_fpv), 0, (_ndec), 1)
-#define	ulfptoa(_fpv, _ndec)	dolfptoa((_fpv)->l_ui, (_fpv)->l_uf, 0, (_ndec), 0)
-#define	ulfptoms(_fpv, _ndec)	dolfptoa((_fpv)->l_ui, (_fpv)->l_uf, 0, (_ndec), 1)
-#define	umfptoa(_fpi, _fpf, _ndec) dolfptoa((_fpi), (_fpf), 0, (_ndec), 0)
diff --git a/contrib/ntp/util/ntp-keygen-opts.c b/contrib/ntp/util/ntp-keygen-opts.c
index aff2d01..8521861 100644
--- a/contrib/ntp/util/ntp-keygen-opts.c
+++ b/contrib/ntp/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *
- *  It has been AutoGen-ed  February  4, 2015 at 02:43:42 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  April  7, 2015 at 04:27:30 AM by AutoGen 5.18.5pre4
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntp-keygen options
  */
 static char const ntp_keygen_opt_strs[2419] =
-/*     0 */ "ntp-keygen (ntp) 4.2.8p1\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.8p2\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -164,14 +164,14 @@ static char const ntp_keygen_opt_strs[2419] =
 /*  2202 */ "no-load-opts\0"
 /*  2215 */ "no\0"
 /*  2218 */ "NTP_KEYGEN\0"
-/*  2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1\n"
+/*  2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  2343 */ "$HOME\0"
 /*  2349 */ ".\0"
 /*  2351 */ ".ntprc\0"
 /*  2358 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2392 */ "\n\0"
-/*  2394 */ "ntp-keygen (ntp) 4.2.8p1";
+/*  2394 */ "ntp-keygen (ntp) 4.2.8p2";
 
 /**
  *  imbits option description:
@@ -1309,7 +1309,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.2.8p1\n\
+  puts(_("ntp-keygen (ntp) 4.2.8p2\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1408,14 +1408,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntp_keygenOptions.pzUsageTitle */
-  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.2.8p1"));
+  puts(_("ntp-keygen (ntp) 4.2.8p2"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/contrib/ntp/util/ntp-keygen-opts.h b/contrib/ntp/util/ntp-keygen-opts.h
index 4848999..54f1ac4 100644
--- a/contrib/ntp/util/ntp-keygen-opts.h
+++ b/contrib/ntp/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *
- *  It has been AutoGen-ed  February  4, 2015 at 02:43:41 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  April  7, 2015 at 04:27:29 AM by AutoGen 5.18.5pre4
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -94,9 +94,9 @@ typedef enum {
 /** count of all options for ntp-keygen */
 #define OPTION_CT    26
 /** ntp-keygen version */
-#define NTP_KEYGEN_VERSION       "4.2.8p1"
+#define NTP_KEYGEN_VERSION       "4.2.8p2"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p1"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p2"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/util/ntp-keygen.1ntp-keygenman b/contrib/ntp/util/ntp-keygen.1ntp-keygenman
index 46bbad8..b600ed4 100644
--- a/contrib/ntp/util/ntp-keygen.1ntp-keygenman
+++ b/contrib/ntp/util/ntp-keygen.1ntp-keygenman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen 1ntp-keygenman "04 Feb 2015" "ntp (4.2.8p1)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Xkaqsu/ag-9kairu)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Kfaqzc/ag-Wfaiyc)
 .\"
-.\" It has been AutoGen-ed February 4, 2015 at 02:43:55 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed April 7, 2015 at 04:27:42 AM by AutoGen 5.18.5pre4
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc b/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
index d70ca2c..ad8a96d 100644
--- a/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
+++ b/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd February 4 2015
+.Dd April 7 2015
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  February  4, 2015 at 02:44:02 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:49 AM by AutoGen 5.18.5pre4
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/util/ntp-keygen.c b/contrib/ntp/util/ntp-keygen.c
index c169021..494bedb 100644
--- a/contrib/ntp/util/ntp-keygen.c
+++ b/contrib/ntp/util/ntp-keygen.c
@@ -827,24 +827,24 @@ gen_md5(
 	str = fheader("MD5key", id, groupname);
 	for (i = 1; i <= MD5KEYS; i++) {
 		for (j = 0; j < MD5SIZE; j++) {
-			int temp;
+			u_char temp;
 
 			while (1) {
 				int rc;
 
-				rc = ntp_crypto_random_buf(&temp, 1);
+				rc = ntp_crypto_random_buf(
+				    &temp, sizeof(temp));
 				if (-1 == rc) {
 					fprintf(stderr, "ntp_crypto_random_buf() failed.\n");
 					exit (-1);
 				}
-				temp &= 0xff;
 				if (temp == '#')
 					continue;
 
 				if (temp > 0x20 && temp < 0x7f)
 					break;
 			}
-			md5key[j] = (u_char)temp;
+			md5key[j] = temp;
 		}
 		md5key[j] = '\0';
 		fprintf(str, "%2d MD5 %s  # MD5 key\n", i,
@@ -2170,15 +2170,29 @@ fheader	(
 	FILE	*str;		/* file handle */
 	char	linkname[MAXFILENAME]; /* link name */
 	int	temp;
-
+#ifdef HAVE_UMASK
+        mode_t  orig_umask;
+#endif
+        
 	snprintf(filename, sizeof(filename), "ntpkey_%s_%s.%u", file,
 	    owner, fstamp); 
-	if ((str = fopen(filename, "w")) == NULL) {
+#ifdef HAVE_UMASK
+        orig_umask = umask( S_IWGRP | S_IRWXO );
+        str = fopen(filename, "w");
+        (void) umask(orig_umask);
+#else
+        str = fopen(filename, "w");
+#endif
+	if (str == NULL) {
 		perror("Write");
 		exit (-1);
 	}
-	snprintf(linkname, sizeof(linkname), "ntpkey_%s_%s", ulink,
-	    hostname);
+        if (strcmp(ulink, "md5") == 0) {
+          strcpy(linkname,"ntp.keys");
+        } else {
+          snprintf(linkname, sizeof(linkname), "ntpkey_%s_%s", ulink,
+                   hostname);
+        }
 	(void)remove(linkname);		/* The symlink() line below matters */
 	temp = symlink(filename, linkname);
 	if (temp < 0)
diff --git a/contrib/ntp/util/ntp-keygen.html b/contrib/ntp/util/ntp-keygen.html
index 3b950ec..1aad39b 100644
--- a/contrib/ntp/util/ntp-keygen.html
+++ b/contrib/ntp/util/ntp-keygen.html
@@ -70,7 +70,7 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  <p>This document applies to version 4.2.8p1 of <code>ntp-keygen</code>.
+  <p>This document applies to version 4.2.8p2 of <code>ntp-keygen</code>.
 
 <div class="node">
 <p><hr>
@@ -1085,7 +1085,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-RC2
+<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2-RC3
 Usage:  ntp-keygen [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/contrib/ntp/util/ntp-keygen.man.in b/contrib/ntp/util/ntp-keygen.man.in
index 6242382..b47691b 100644
--- a/contrib/ntp/util/ntp-keygen.man.in
+++ b/contrib/ntp/util/ntp-keygen.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen @NTP_KEYGEN_MS@ "04 Feb 2015" "ntp (4.2.8p1)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Xkaqsu/ag-9kairu)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Kfaqzc/ag-Wfaiyc)
 .\"
-.\" It has been AutoGen-ed February 4, 2015 at 02:43:55 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed April 7, 2015 at 04:27:42 AM by AutoGen 5.18.5pre4
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/util/ntp-keygen.mdoc.in b/contrib/ntp/util/ntp-keygen.mdoc.in
index da99a8d..540ff4f 100644
--- a/contrib/ntp/util/ntp-keygen.mdoc.in
+++ b/contrib/ntp/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd February 4 2015
+.Dd April 7 2015
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  February  4, 2015 at 02:44:02 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:49 AM by AutoGen 5.18.5pre4
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME