From: Harlan Stenn Date: Thu, 2 Jun 2016 13:43:34 +0000 (+0000) Subject: NTP_4_3_93 X-Git-Tag: NTP_4_3_93^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402d3d3ba89bb4542e8e06e7c44a3d5ffd5bb43d;p=thirdparty%2Fntp.git NTP_4_3_93 bk: 57503806AnT09vj17-YRqARZahJC8Q --- diff --git a/ChangeLog b/ChangeLog index e5193107a..fce017c2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.93) 2016/06/02 Released by Harlan Stenn From ntp-4.2.8p8: * [Sec 3042] Broadcast Interleave. HStenn. * [Sec 3043] Autokey association reset. perlinger@ntp.org, stenn@ntp.org diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 2c9f1a8dd..ac6a1ab72 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed April 27, 2016 at 11:58:36 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 2, 2016 at 01:41:17 PM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2335,8 +2335,8 @@ otherwise, should be avoided. This option specifies the Differentiated Services Control Point (DSCP) value, a 6-bit code. The default value is 46, signifying Expedited Forwarding. -@item @code{enable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats} | @code{unpeer_crypto_early} | @code{unpeer_crypto_nak_early} | @code{unpeer_digest_early}]} -@item @code{disable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats} | @code{unpeer_crypto_early} | @code{unpeer_crypto_nak_early} | @code{unpeer_digest_early}]} +@item @code{enable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats} | @code{peer_clear_digest_early} | @code{unpeer_crypto_early} | @code{unpeer_crypto_nak_early} | @code{unpeer_digest_early}]} +@item @code{disable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats} | @code{peer_clear_digest_early} | @code{unpeer_crypto_early} | @code{unpeer_crypto_nak_early} | @code{unpeer_digest_early}]} Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2401,6 +2401,26 @@ closes the feedback loop, which is useful for testing. The default for this flag is @code{enable}. +@item @code{peer_clear_digest_early} +By default, if +@code{ntpd(1ntpdmdoc)} +is using autokey and it +receives a crypto-NAK packet that +passes the duplicate packet and origin timestamp checks +the peer variables are immediately cleared. +While this is generally a feature +as it allows for quick recovery if a server key has changed, +a properly forged and appropriately delivered crypto-NAK packet +can be used in a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +@code{peerstats} +file for evidence of any of these attacks. +The +default for this flag is +@code{enable}. @item @code{stats} Enables the statistics facility. See the diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 135d70729..e7e069a4d 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed April 27, 2016 at 11:58:39 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 2, 2016 at 01:41:20 PM by AutoGen 5.18.5 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index b1d40b467..3622f181b 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed April 27, 2016 at 11:58:41 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 2, 2016 at 01:41:22 PM by AutoGen 5.18.5 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.3.92 +ntpd - NTP daemon program - Ver. 4.3.93 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 02e09c1f6..1637b2879 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "27 Apr 2016" "4.3.92" "File Formats" +.TH ntp.conf 5man "02 Jun 2016" "4.3.93" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-GSaioH/ag-SSaanH) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-A2aWu5/ag-M2aOt5) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:23 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:04 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2618,9 +2618,9 @@ This option specifies the Differentiated Services Control Point (DSCP) value, a 6-bit code. The default value is 46, signifying Expedited Forwarding. .TP 7 -.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] +.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]peer_clear_digest_early\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] .TP 7 -.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] +.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]peer_clear_digest_early\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2693,6 +2693,27 @@ The default for this flag is \f\*[B-Font]enable\f[]. .TP 7 +.NOP \f\*[B-Font]peer_clear_digest_early\f[] +By default, if +\fCntpd\f[]\fR(1ntpdmdoc)\f[] +is using autokey and it +receives a crypto-NAK packet that +passes the duplicate packet and origin timestamp checks +the peer variables are immediately cleared. +While this is generally a feature +as it allows for quick recovery if a server key has changed, +a properly forged and appropriately delivered crypto-NAK packet +can be used in a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +\f\*[B-Font]peerstats\f[] +file for evidence of any of these attacks. +The +default for this flag is +\f\*[B-Font]enable\f[]. +.TP 7 .NOP \f\*[B-Font]stats\f[] Enables the statistics facility. See the diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 78d9fa46b..22eeff9be 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd April 27 2016 +.Dd June 2 2016 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:44 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:25 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2440,6 +2440,7 @@ The default value is 46, signifying Expedited Forwarding. .Cm calibrate | Cm kernel | .Cm mode7 | Cm monitor | .Cm ntp | Cm stats | +.Cm peer_clear_digest_early | .Cm unpeer_crypto_early | Cm unpeer_crypto_nak_early | Cm unpeer_digest_early .Oc .Xc @@ -2449,6 +2450,7 @@ The default value is 46, signifying Expedited Forwarding. .Cm calibrate | Cm kernel | .Cm mode7 | Cm monitor | .Cm ntp | Cm stats | +.Cm peer_clear_digest_early | .Cm unpeer_crypto_early | Cm unpeer_crypto_nak_early | Cm unpeer_digest_early .Oc .Xc @@ -2516,6 +2518,26 @@ closes the feedback loop, which is useful for testing. The default for this flag is .Ic enable . +.It Cm peer_clear_digest_early +By default, if +.Xr ntpd 1ntpdmdoc +is using autokey and it +receives a crypto\-NAK packet that +passes the duplicate packet and origin timestamp checks +the peer variables are immediately cleared. +While this is generally a feature +as it allows for quick recovery if a server key has changed, +a properly forged and appropriately delivered crypto\-NAK packet +can be used in a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +.Cm peerstats +file for evidence of any of these attacks. +The +default for this flag is +.Ic enable . .It Cm stats Enables the statistics facility. See the diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 98105cc3d..f62abef79 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.3.92 of ntp.conf. +

This document applies to version 4.3.93 of ntp.conf.

Short Contents

@@ -167,8 +167,14 @@ in some weird and even destructive behavior.

If the Basic Socket Interface Extensions for IPv6 (RFC-2553) is detected, support for the IPv6 address family is generated in addition to the default support of the IPv4 address family. -In a few cases, including the reslist billboard generated -by ntpdc, IPv6 addresses are automatically generated. +In a few cases, including the +reslist +billboard generated +by +ntpq(1ntpqmdoc) +or +ntpdc(1ntpdcmdoc), +IPv6 addresses are automatically generated. IPv6 addresses can be identified by the presence of colons : in the address field. @@ -187,7 +193,7 @@ qualifier forces DNS resolution to the IPv6 namespace. See IPv6 references for the equivalent classes for that address family.

-
pool address [burst] [iburst] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll]
server address [key key | autokey] [burst] [iburst] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll]
peer address [key key | autokey] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll]
broadcast address [key key | autokey] [version version] [prefer] [minpoll minpoll] [ttl ttl]
manycastclient address [key key | autokey] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll] [ttl ttl]
+
pool address [burst] [iburst] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll]
server address [key key | autokey] [burst] [iburst] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll] [true]
peer address [key key | autokey] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll] [true] [xleave]
broadcast address [key key | autokey] [version version] [prefer] [minpoll minpoll] [ttl ttl] [xleave]
manycastclient address [key key | autokey] [version version] [prefer] [minpoll minpoll] [maxpoll maxpoll] [ttl ttl]

These five commands specify the time server name or address to be used and the mode in which to operate. @@ -296,7 +302,9 @@ described in instead of the usual one. The packet spacing is normally 2 s; however, the spacing between the first and second packets -can be changed with the calldelay command to allow +can be changed with the +calldelay +command to allow additional time for a modem or ISDN call to complete. This is designed to improve timekeeping quality with the @@ -306,7 +314,9 @@ command and s addresses. instead of the usual one. The packet spacing is normally 2 s; however, the spacing between the first two packets can be -changed with the calldelay command to allow +changed with the +calldelay +command to allow additional time for a modem or ISDN call to complete. This is designed to speed the initial synchronization acquisition with the @@ -335,6 +345,9 @@ the option to a lower limit of 4 (16 s).

noselect
Marks the server as unused, except for display purposes. The server is discarded by the selection algroithm. +
preempt
Says the association can be preempted. +
true
Marks the server as a truechimer. +Use this option only for testing.
prefer
Marks the server as preferred. All other things being equal, this host will be chosen for synchronization among a set of @@ -346,6 +359,10 @@ page provided in /usr/share/doc/ntp) for further information. +
true
Forces the association to always survive the selection and clustering algorithms. +This option should almost certainly +only +be used while testing an association.
ttl ttl
This option is used only with broadcast server and manycast client modes. It specifies the time-to-live @@ -362,6 +379,11 @@ network administrator. packets. Versions 1-4 are the choices, with version 4 the default. +
xleave
Valid in +peer +and +broadcast +modes only, this flag enables interleave mode.
Auxiliary Commands
@@ -512,7 +534,7 @@ and commands and also by remote configuration commands sent by a ntpdc(1ntpdcmdoc) -program running in +program running on another machine. If this flag is enabled, which is the default case, new broadcast client and symmetric passive associations and @@ -698,7 +720,7 @@ using the host name, network address and public keys, all of which are bound together by the protocol specifically to deflect masquerade attacks. For this reason Autokey -includes the source and destinatino IP addresses in message digest +includes the source and destination IP addresses in message digest computations and so the same addresses must be available at both the server and client. For this reason operation @@ -884,8 +906,8 @@ This overrides the link ntpkey_key_hostname in the keys directory. -
iffpar file
Specifies the location of the optional IFF parameters file.This -overrides the link +
iffpar file
Specifies the location of the optional IFF parameters file. +This overrides the link ntpkey_iff_hostname in the keys directory.
leap file
Specifies the location of the optional leapsecond file. @@ -893,8 +915,7 @@ This overrides the link ntpkey_leap in the keys directory.
mvpar file
Specifies the location of the optional MV parameters file. -This -overrides the link +This overrides the link ntpkey_mv_hostname in the keys directory.
pw password
Specifies the password to decrypt files containing private keys and @@ -1022,7 +1043,7 @@ supported. Statistic files are managed using file generation sets and scripts in the ./scripts -directory of this distribution. +directory of the source code distribution. Using these facilities and unix @@ -1320,7 +1341,9 @@ When there is already a file with this name and the number of links of this file is one, it is renamed appending a dot, the letter C, -and the pid of the ntpd server process. +and the pid of the +ntpd(1ntpdmdoc) +server process. When the number of links is greater than one, the file is unlinked. This @@ -1369,7 +1392,9 @@ Source address based restrictions are easily circumvented by a determined cracker.

Clients can be denied service because they are explicitly -included in the restrict list created by the restrict command +included in the restrict list created by the +restrict +command or implicitly as the result of cryptographic or rate limit violations. Cryptographic violations include certificate @@ -1379,9 +1404,9 @@ at abusive rates. Some violations cause denied service only for the offending packet, others cause denied service for a timed period and others cause the denied service for -an indefinate period. +an indefinite period. When a client or network is denied access -for an indefinate period, the only way at present to remove +for an indefinite period, the only way at present to remove the restrictions is by restarting the server.

The Kiss-of-Death Packet
@@ -1438,7 +1463,9 @@ Packets that violate these minima are discarded and a kiss-o'-death packet returned if enabled. The default minimum average and minimum are 5 and 2, respectively. -The monitor subcommand specifies the probability of discard +The +monitor +subcommand specifies the probability of discard for packets that overflow the rate-control window.
restrict address [mask mask] [flag ...]
The address @@ -1490,7 +1517,9 @@ per second. If another KoD packet occurs within one second after the last one, the packet is dropped.
limited
Deny service if the packet spacing violates the lower limits specified -in the discard command. +in the +discard +command. A history of clients is kept using the monitoring capability of ntpd(1ntpdmdoc). @@ -1543,7 +1572,9 @@ and queries.
notrap
Decline to provide mode 6 control message trap service to matching hosts. -The trap service is a subsystem of the ntpdq control message +The trap service is a subsystem of the +ntpq(1ntpqmdoc) +control message protocol which is intended for use by remote event logging programs.
notrust
Deny service unless the packet is cryptographically authenticated.
ntpport
This is actually a match algorithm modifier, rather than a @@ -1615,8 +1646,11 @@ The library can also be used with other NTPv4 modes as well and is highly recommended, especially for broadcast modes.

A persistent manycast client association is configured -using the manycastclient command, which is similar to the -server command but with a multicast (IPv4 class +using the +manycastclient +command, which is similar to the +server +command but with a multicast (IPv4 class D or IPv6 prefix FF) @@ -1686,7 +1720,9 @@ command and, under normal circumstances, increments to the maxpolll value specified in this command. Initially, the TTL is -set at the minimum hops specified by the ttl command. +set at the minimum hops specified by the +ttl +command. At each retransmission the TTL is increased until reaching the maximum hops specified by this command or a sufficient number client associations have been found. @@ -2287,7 +2323,8 @@ must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided.

dscp value
This option specifies the Differentiated Services Control Point (DSCP) value, -a 6-bit code. The default value is 46, signifying Expedited Forwarding. +a 6-bit code. +The default value is 46, signifying Expedited Forwarding.
enable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats | unpeer_crypto_early | unpeer_crypto_nak_early | unpeer_digest_early]
disable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats | unpeer_crypto_early | unpeer_crypto_nak_early | unpeer_digest_early]
Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2480,7 +2517,8 @@ A message class may also be followed by the all keyword to enable/disable all -messages of the respective message class.Thus, a minimal log configuration +messages of the respective message class. +Thus, a minimal log configuration could look like this:
     
      logconfig =syncstatus +sysevents
@@ -2503,7 +2541,9 @@ peers, system events and so on is suppressed.
 be used instead of the default system
 syslog(3)
 facility. 
-This is the same operation as the -l command line option. 
+This is the same operation as the
+-l
+command line option. 
 
setvar variable [default]
This command adds an additional system variable. These variables can be used to distribute additional information such as @@ -2617,7 +2657,8 @@ The default is 32 megabytes on non-Linux machines, and -1 under Linux. mlockall() function. Defaults to 50 4k pages (200 4k pages in OpenBSD). -
filenum Nfiledescriptors
Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. +
filenum Nfiledescriptors
Specifies the maximum number of file descriptors ntpd may have open at once. +Defaults to the system default.
trap host_address [port port_number] [interface interface_address]
This command configures a trap receiver at the given host address and port number for sending messages with the specified diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 290bf0de9..15ba6f86a 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "27 Apr 2016" "4.3.92" "File Formats" +.TH ntp.conf 5 "02 Jun 2016" "4.3.93" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-GSaioH/ag-SSaanH) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-A2aWu5/ag-M2aOt5) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:23 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:04 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2618,9 +2618,9 @@ This option specifies the Differentiated Services Control Point (DSCP) value, a 6-bit code. The default value is 46, signifying Expedited Forwarding. .TP 7 -.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] +.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]peer_clear_digest_early\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] .TP 7 -.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] +.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[] | \f\*[B-Font]peer_clear_digest_early\f[] | \f\*[B-Font]unpeer_crypto_early\f[] | \f\*[B-Font]unpeer_crypto_nak_early\f[] | \f\*[B-Font]unpeer_digest_early\f[]] Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2693,6 +2693,27 @@ The default for this flag is \f\*[B-Font]enable\f[]. .TP 7 +.NOP \f\*[B-Font]peer_clear_digest_early\f[] +By default, if +\fCntpd\f[]\fR(@NTPD_MS@)\f[] +is using autokey and it +receives a crypto-NAK packet that +passes the duplicate packet and origin timestamp checks +the peer variables are immediately cleared. +While this is generally a feature +as it allows for quick recovery if a server key has changed, +a properly forged and appropriately delivered crypto-NAK packet +can be used in a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +\f\*[B-Font]peerstats\f[] +file for evidence of any of these attacks. +The +default for this flag is +\f\*[B-Font]enable\f[]. +.TP 7 .NOP \f\*[B-Font]stats\f[] Enables the statistics facility. See the diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index fb8306057..8a38a6270 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd April 27 2016 +.Dd June 2 2016 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:44 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:25 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2440,6 +2440,7 @@ The default value is 46, signifying Expedited Forwarding. .Cm calibrate | Cm kernel | .Cm mode7 | Cm monitor | .Cm ntp | Cm stats | +.Cm peer_clear_digest_early | .Cm unpeer_crypto_early | Cm unpeer_crypto_nak_early | Cm unpeer_digest_early .Oc .Xc @@ -2449,6 +2450,7 @@ The default value is 46, signifying Expedited Forwarding. .Cm calibrate | Cm kernel | .Cm mode7 | Cm monitor | .Cm ntp | Cm stats | +.Cm peer_clear_digest_early | .Cm unpeer_crypto_early | Cm unpeer_crypto_nak_early | Cm unpeer_digest_early .Oc .Xc @@ -2516,6 +2518,26 @@ closes the feedback loop, which is useful for testing. The default for this flag is .Ic enable . +.It Cm peer_clear_digest_early +By default, if +.Xr ntpd @NTPD_MS@ +is using autokey and it +receives a crypto\-NAK packet that +passes the duplicate packet and origin timestamp checks +the peer variables are immediately cleared. +While this is generally a feature +as it allows for quick recovery if a server key has changed, +a properly forged and appropriately delivered crypto\-NAK packet +can be used in a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +.Cm peerstats +file for evidence of any of these attacks. +The +default for this flag is +.Ic enable . .It Cm stats Enables the statistics facility. See the diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index e93e20976..7c86ae78c 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "27 Apr 2016" "4.3.92" "File Formats" +.TH ntp.keys 5man "02 Jun 2016" "4.3.93" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:28 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:09 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index a7ad203fe..34e9b0440 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd April 27 2016 +.Dd June 2 2016 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:47 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:28 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index b41836adb..c78c9b8f1 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the symmetric key file for the NTP Project's ntpd program. -

This document applies to version 4.3.92 of ntp.keys. +

This document applies to version 4.3.93 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 9d0f3094e..612cf881c 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "27 Apr 2016" "4.3.92" "File Formats" +.TH ntp.keys 5 "02 Jun 2016" "4.3.93" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:28 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:09 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 7a3239a47..00d9c17fa 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd April 27 2016 +.Dd June 2 2016 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:47 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:28 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index c4a241b28..a1bd1972d 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed April 27, 2016 at 11:56:23 AM by AutoGen 5.18.5 + * It has been AutoGen-ed June 2, 2016 at 01:39:04 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3126] = -/* 0 */ "ntpd 4.3.92\n" +/* 0 */ "ntpd 4.3.93\n" "Copyright (C) 1992-2016 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" @@ -205,12 +205,12 @@ static char const ntpd_opt_strs[3126] = /* 2899 */ "output version information and exit\0" /* 2935 */ "version\0" /* 2943 */ "NTPD\0" -/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.92\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.93\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.92"; +/* 3114 */ "ntpd 4.3.93"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.92\n\ + puts(_("ntpd 4.3.93\n\ Copyright (C) 1992-2016 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\ @@ -1670,7 +1670,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.3.92\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.93\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.92")); + puts(_("ntpd 4.3.93")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 43966b087..5d103a131 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed April 27, 2016 at 11:56:22 AM by AutoGen 5.18.5 + * It has been AutoGen-ed June 2, 2016 at 01:39:02 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -106,9 +106,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 38 /** ntpd version */ -#define NTPD_VERSION "4.3.92" +#define NTPD_VERSION "4.3.93" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.92" +#define NTPD_FULL_VERSION "ntpd 4.3.93" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 7a0f1f664..6c7abb4c9 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "27 Apr 2016" "4.3.92" "User Commands" +.TH ntpd 1ntpdman "02 Jun 2016" "4.3.93" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-SWaGHI/ag-4WayGI) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-K.aada/ag-W.a4ba) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:31 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:12 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index edb643cb9..a7cfc0c18 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd April 27 2016 +.Dd June 2 2016 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed April 27, 2016 at 11:58:49 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 01:41:30 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 8b3d3c8f3..4de56d764 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

This document applies to version 4.3.92 of ntpd. +

This document applies to version 4.3.93 of ntpd.