DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 18:05:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

nts: allow multiple files with trusted certificates

Browse Source 
Allow the ntstrustedcerts directive to be specified multiple times.
This commit is contained in:
Miroslav Lichvar
2021-02-11 12:20:59 +01:00
parent 90557cf1ba
commit 316d47e3b4
7 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nts_ke_session.c
View File

@@ -643,7 +643,7 @@ deinit_gnutls(void)
static NKSN_Credentials
create_credentials(const char **certs, const char **keys, int n_certs_keys,
const char *trusted_certs)
const char **trusted_certs, int n_trusted_certs)
{
gnutls_certificate_credentials_t credentials = NULL;
int i, r;
@@ -674,10 +674,12 @@ create_credentials(const char **certs, const char **keys, int n_certs_keys,
}
if (trusted_certs) {
r = gnutls_certificate_set_x509_trust_file(credentials, trusted_certs,
GNUTLS_X509_FMT_PEM);
if (r < 0)
goto error;
for (i = 0; i < n_trusted_certs; i++) {
r = gnutls_certificate_set_x509_trust_file(credentials, trusted_certs[i],
GNUTLS_X509_FMT_PEM);
if (r < 0)
goto error;
}
}
}
@@ -698,15 +700,15 @@ error:
NKSN_Credentials
NKSN_CreateServerCertCredentials(const char **certs, const char **keys, int n_certs_keys)
{
return create_credentials(certs, keys, n_certs_keys, NULL);
return create_credentials(certs, keys, n_certs_keys, NULL, 0);
}
/* ================================================== */
NKSN_Credentials
NKSN_CreateClientCertCredentials(const char *trusted_certs)
NKSN_CreateClientCertCredentials(const char **trusted_certs, int n_certs)
{
return create_credentials(NULL, NULL, 0, trusted_certs);
return create_credentials(NULL, NULL, 0, trusted_certs, n_certs);
}
/* ================================================== */