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

nts: deinit gnutls when setting of credentials fails

Browse source 
This is needed to cleanly exit when the server key/cert couldn't be
loaded.
This commit is contained in:
Miroslav Lichvar 2020-07-15 12:11:38 +02:00
parent 962afb9e7d
commit 55a90c3735
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nts_ke_session.c
View file

@ -622,7 +622,8 @@ init_gnutls(void)
static void static void
deinit_gnutls(void) deinit_gnutls(void)
{ {
assert(gnutls_initialised); if (!gnutls_initialised || credentials_counter > 0)
return;
LCL_RemoveParameterChangeHandler(handle_step, NULL); LCL_RemoveParameterChangeHandler(handle_step, NULL);
@ -674,6 +675,7 @@ error:
LOG(LOGS_ERR, "Could not set credentials : %s", gnutls_strerror(r)); LOG(LOGS_ERR, "Could not set credentials : %s", gnutls_strerror(r));
if (credentials) if (credentials)
gnutls_certificate_free_credentials(credentials); gnutls_certificate_free_credentials(credentials);
deinit_gnutls();
return NULL; return NULL;
} }
@ -684,9 +686,6 @@ NKSN_DestroyCertCredentials(void *credentials)
{ {
gnutls_certificate_free_credentials(credentials); gnutls_certificate_free_credentials(credentials);
credentials_counter--; credentials_counter--;
if (credentials_counter != 0)
return;
deinit_gnutls(); deinit_gnutls();
} }