faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmdparse: don't allow NTP key ID of 0

Browse source 
Key number 0 is used as inactive key, prevent the user from
inadvertently not using authentication.
This commit is contained in:
Miroslav Lichvar 2014-03-21 12:47:52 +01:00
parent 6560628209
commit 6c2a1e62e0
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrony.texi.in
View file

@ -1746,7 +1746,8 @@ pairs. The format of the file is shown below
Each line consists of an ID, a name of authentication hash function (optional) Each line consists of an ID, a name of authentication hash function (optional)
and a password. The ID can be any unsigned integer in the range 0 through and a password. The ID can be any unsigned integer in the range 0 through
2**32-1. The hash function is MD5 by default, depending on how was 2**32-1, but ID of 0 can be used only for the command key and not for the NTP
authentication. The hash function is MD5 by default, depending on how was
@code{chronyd} compiled other allowed hash functions may be SHA1, SHA256, @code{chronyd} compiled other allowed hash functions may be SHA1, SHA256,
SHA384, SHA512, RMD128, RMD160, RMD256, RMD320, TIGER and WHIRLPOOL. The SHA384, SHA512, RMD128, RMD160, RMD256, RMD320, TIGER and WHIRLPOOL. The
password can be encoded as a string of characters not containing a space with password can be encoded as a string of characters not containing a space with
@ -2829,7 +2830,8 @@ keys file, defined by the keyfile command.
If the key option is present, @code{chronyd} will attempt to use If the key option is present, @code{chronyd} will attempt to use
authenticated packets when communicating with this server. The key authenticated packets when communicating with this server. The key
number used will be the single argument to the key option. The server number used will be the single argument to the key option (an
unsigned integer in the range 1 through 2**32-1). The server
must have the same password for this key number configured, otherwise no must have the same password for this key number configured, otherwise no
relationship between the computers will be possible. relationship between the computers will be possible.

3
cmdparse.c
View file

@ -134,7 +134,8 @@ CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
line += n; line += n;
} }
} else if (!strcasecmp(cmd, "key")) { } else if (!strcasecmp(cmd, "key")) {
if (sscanf(line, "%lu%n", &src->params.authkey, &n) != 1) { if (sscanf(line, "%lu%n", &src->params.authkey, &n) != 1 ||
src->params.authkey == INACTIVE_AUTHKEY) {
result = CPS_BadKey; result = CPS_BadKey;
ok = 0; ok = 0;
done = 1; done = 1;