[Git][NTPsec/ntpsec][master] Address GitLab bug #440: Inconsistency with key identifier size

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
ec3cbc09 by Eric S. Raymond at 2018-08-08T18:52:56Z
Address GitLab bug #440: Inconsistency with key identifier size

I audited RFC5905 and the code, verifting that the range of key IDs is
1-65535 - 32 bits unsigned, excluding zero.  I rthen went through the
documentation and made this limit uniform in the text.

I see that KEYID_T_MAX has already been removed.

- - - - -


5 changed files:

- docs/authentic.txt
- docs/includes/assoc-options.txt
- docs/includes/auth-commands.txt
- docs/includes/ntp.keys-body.txt
- docs/ntpkeygen.txt


Changes:

=====================================
docs/authentic.txt
=====================================
@@ -54,7 +54,7 @@ discarded.  Authentication doesn't prevent replays.
 [[symm]]
 === Symmetric-Key Cryptography ===
 
-NTP allows any one of possibly 65,534 keys, each distinguished by a
+NTP allows any one of possibly 65,535 keys, each distinguished by a
 32-bit key identifier, to authenticate an association. The servers and
 clients involved must agree on the key and key identifier to
 authenticate NTP packets. Keys and related information are specified
@@ -134,7 +134,7 @@ access to all but correctly authenticated clients.
 [[formats]]
 == Data Formats ==
 
-The NTPv4 specification (RFC 5905) allows any one of possibly 65,534
+The NTPv4 specification (RFC 5905) allows any one of possibly 65,535
 message digest keys (excluding zero), each distinguished by a 32-bit key
 ID, to authenticate an association. The servers and clients involved
 must agree on the key ID, key type and key to authenticate NTP packets.


=====================================
docs/includes/assoc-options.txt
=====================================
@@ -33,7 +33,7 @@
 +key+ _key_::
   All packets sent to and received from the server or peer are to
   include authentication fields encrypted using the specified _key_
-  identifier with values from 1 to 65534, inclusive. The default is to
+  identifier with values from 1 to 65535, inclusive. The default is to
   include no encryption field.
 
 +minpoll+ _minpoll_::


=====================================
docs/includes/auth-commands.txt
=====================================
@@ -5,7 +5,7 @@
   Specifies the key identifier to use with the
   {ntpqman} utility, which uses the standard protocol defined in
   RFC 5905. The _key_ argument is the key identifier for a trusted key,
-  where the value can be in the range 1 to 65,534, inclusive.
+  where the value can be in the range 1 to 65,535, inclusive.
 
 [[keys]]
 +keys+ _keyfile_::
@@ -28,6 +28,6 @@ The authentication procedures require that both the local and remote
 servers share the same key and key identifier for this purpose,
 although different keys can be used with different servers.
 The _key_ arguments are 32-bit unsigned integers with values from 1 to
-65,534.
+65,535.
 
 // end


=====================================
docs/includes/ntp.keys-body.txt
=====================================
@@ -7,7 +7,7 @@ Support" page of the Web documentation.
 {ntpdman} reads its keys from a file specified using the -k command line
 option or the 'keys' statement in the configuration file. While key
 number 0 is fixed by the NTP standard (as 56 zero bits) and may not be
-changed, one or more keys numbered between 1 and 65534 may be
+changed, one or more keys numbered between 1 and 65535 may be
 arbitrarily set in the keys file.
 
 The key file uses the same comment conventions as the configuration
@@ -17,7 +17,7 @@ file. Key entries use a fixed format of the form
 keyno type key
 --------------
 
-where `keyno` is a positive integer (between 1 and 65534),
+where `keyno` is a positive integer (between 1 and 65535),
 `type` is the message digest algorithm, and
 `key` is the key itself.
 


=====================================
docs/ntpkeygen.txt
=====================================
@@ -35,7 +35,7 @@ Figure 1. Typical Symmetric Key File
 
 Figure 1 shows a typical symmetric keys file used by the reference
 implementation. Each line of the file contains three fields, first
-keyno an integer between 1 and 65534, inclusive, representing the
+keyno an integer between 1 and 65535, inclusive, representing the
 key identifier used in the `server` configuration commands. Next
 is the key type for the message digest algorithm, which can be any
 message digest algorithm supported by the OpenSSL library.



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/ec3cbc098f5c7a722e269f13e5fe1cb0cb33cdd1

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/ec3cbc098f5c7a722e269f13e5fe1cb0cb33cdd1
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20180808/ca29804f/attachment-0001.html>