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

nts: avoid key corruption on failed loading

Browse source 
Don't save a loaded key to the server key slot until it is fully
decoded.
This commit is contained in:
Miroslav Lichvar 2020-08-20 11:18:09 +02:00
parent 892636036a
commit 51172b3510
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nts_ke_server.c
View file

@ -560,6 +560,7 @@ static void
load_keys(void) load_keys(void)
{ {
char *dump_dir, line[1024], *words[MAX_WORDS]; char *dump_dir, line[1024], *words[MAX_WORDS];
unsigned char key[SIV_MAX_KEY_LENGTH];
int i, index, key_length, algorithm; int i, index, key_length, algorithm;
double key_age; double key_age;
FILE *f; FILE *f;
@ -587,13 +588,15 @@ load_keys(void)
sscanf(words[0], "%"PRIX32, &id) != 1) sscanf(words[0], "%"PRIX32, &id) != 1)
goto error; goto error;
index = id % MAX_SERVER_KEYS; if (UTI_HexToBytes(words[1], key, sizeof (key)) != key_length)
if (UTI_HexToBytes(words[1], server_keys[index].key,
sizeof (server_keys[index].key)) != key_length)
goto error; goto error;
index = id % MAX_SERVER_KEYS;
server_keys[index].id = id; server_keys[index].id = id;
assert(sizeof (server_keys[index].key) == sizeof (key));
memcpy(server_keys[index].key, key, key_length);
if (!SIV_SetKey(server_keys[index].siv, server_keys[index].key, key_length)) if (!SIV_SetKey(server_keys[index].siv, server_keys[index].key, key_length))
LOG_FATAL("Could not set SIV key"); LOG_FATAL("Could not set SIV key");