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

nts: define type for credentials

Browse source 
Add a NKSN_Credentials type to avoid referring to it as void *.
This commit is contained in:
Miroslav Lichvar 2021-02-11 11:05:25 +01:00
parent 0e4995e10b
commit 80e627c86b
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nts_ke_client.c
View file

@ -58,7 +58,7 @@ struct NKC_Instance_Record {
/* ================================================== */ /* ================================================== */
static void *client_credentials = NULL; static NKSN_Credentials client_credentials = NULL;
static int client_credentials_refs = 0; static int client_credentials_refs = 0;
/* ================================================== */ /* ================================================== */

2
nts_ke_server.c
View file

@ -95,7 +95,7 @@ static int initialised = 0;
/* Array of NKSN instances */ /* Array of NKSN instances */
static ARR_Instance sessions; static ARR_Instance sessions;
static void *server_credentials; static NKSN_Credentials server_credentials;
/* ================================================== */ /* ================================================== */

17
nts_ke_session.c
View file

@ -641,7 +641,7 @@ deinit_gnutls(void)
/* ================================================== */ /* ================================================== */
static void * static NKSN_Credentials
create_credentials(const char *cert, const char *key, const char *trusted_certs) create_credentials(const char *cert, const char *key, const char *trusted_certs)
{ {
gnutls_certificate_credentials_t credentials = NULL; gnutls_certificate_credentials_t credentials = NULL;
@ -679,7 +679,7 @@ create_credentials(const char *cert, const char *key, const char *trusted_certs)
credentials_counter++; credentials_counter++;
return credentials; return (NKSN_Credentials)credentials;
error: error:
LOG(LOGS_ERR, "Could not set credentials : %s", gnutls_strerror(r)); LOG(LOGS_ERR, "Could not set credentials : %s", gnutls_strerror(r));
@ -691,7 +691,7 @@ error:
/* ================================================== */ /* ================================================== */
void * NKSN_Credentials
NKSN_CreateServerCertCredentials(const char *cert, const char *key) NKSN_CreateServerCertCredentials(const char *cert, const char *key)
{ {
return create_credentials(cert, key, NULL); return create_credentials(cert, key, NULL);
@ -699,7 +699,7 @@ NKSN_CreateServerCertCredentials(const char *cert, const char *key)
/* ================================================== */ /* ================================================== */
void * NKSN_Credentials
NKSN_CreateClientCertCredentials(const char *trusted_certs) NKSN_CreateClientCertCredentials(const char *trusted_certs)
{ {
return create_credentials(NULL, NULL, trusted_certs); return create_credentials(NULL, NULL, trusted_certs);
@ -708,9 +708,9 @@ NKSN_CreateClientCertCredentials(const char *trusted_certs)
/* ================================================== */ /* ================================================== */
void void
NKSN_DestroyCertCredentials(void *credentials) NKSN_DestroyCertCredentials(NKSN_Credentials credentials)
{ {
gnutls_certificate_free_credentials(credentials); gnutls_certificate_free_credentials((gnutls_certificate_credentials_t)credentials);
credentials_counter--; credentials_counter--;
deinit_gnutls(); deinit_gnutls();
} }
@ -758,12 +758,13 @@ NKSN_DestroyInstance(NKSN_Instance inst)
int int
NKSN_StartSession(NKSN_Instance inst, int sock_fd, const char *label, NKSN_StartSession(NKSN_Instance inst, int sock_fd, const char *label,
void *credentials, double timeout) NKSN_Credentials credentials, double timeout)
{ {
assert(inst->state == KE_STOPPED); assert(inst->state == KE_STOPPED);
inst->tls_session = create_tls_session(inst->server, sock_fd, inst->server_name, inst->tls_session = create_tls_session(inst->server, sock_fd, inst->server_name,
credentials, priority_cache); (gnutls_certificate_credentials_t)credentials,
priority_cache);
if (!inst->tls_session) if (!inst->tls_session)
return 0; return 0;

10
nts_ke_session.h
View file

@ -30,6 +30,8 @@
#include "nts_ke.h" #include "nts_ke.h"
#include "siv.h" #include "siv.h"
typedef struct NKSN_Credentials_Record *NKSN_Credentials;
typedef struct NKSN_Instance_Record *NKSN_Instance; typedef struct NKSN_Instance_Record *NKSN_Instance;
/* Handler for received NTS-KE messages. A zero return code stops /* Handler for received NTS-KE messages. A zero return code stops
@ -39,11 +41,11 @@ typedef int (*NKSN_MessageHandler)(void *arg);
/* Get server or client credentials using a server certificate and key, /* Get server or client credentials using a server certificate and key,
or certificates of trusted CAs. The credentials may be shared between or certificates of trusted CAs. The credentials may be shared between
different clients or servers. */ different clients or servers. */
extern void *NKSN_CreateServerCertCredentials(const char *cert, const char *key); extern NKSN_Credentials NKSN_CreateServerCertCredentials(const char *cert, const char *key);
extern void *NKSN_CreateClientCertCredentials(const char *trusted_certs); extern NKSN_Credentials NKSN_CreateClientCertCredentials(const char *trusted_certs);
/* Destroy the credentials */ /* Destroy the credentials */
extern void NKSN_DestroyCertCredentials(void *credentials); extern void NKSN_DestroyCertCredentials(NKSN_Credentials credentials);
/* Create an instance */ /* Create an instance */
extern NKSN_Instance NKSN_CreateInstance(int server_mode, const char *server_name, extern NKSN_Instance NKSN_CreateInstance(int server_mode, const char *server_name,
@ -54,7 +56,7 @@ extern void NKSN_DestroyInstance(NKSN_Instance inst);
/* Start a new NTS-KE session */ /* Start a new NTS-KE session */
extern int NKSN_StartSession(NKSN_Instance inst, int sock_fd, const char *label, extern int NKSN_StartSession(NKSN_Instance inst, int sock_fd, const char *label,
void *credentials, double timeout); NKSN_Credentials credentials, double timeout);
/* Begin an NTS-KE message. A request should be made right after starting /* Begin an NTS-KE message. A request should be made right after starting
the session and response should be made in the message handler. */ the session and response should be made in the message handler. */

2
test/unit/nts_ke_session.c
View file

@ -162,7 +162,7 @@ check_finished(void *arg)
void void
test_unit(void) test_unit(void)
{ {
void *client_cred, *server_cred; NKSN_Credentials client_cred, server_cred;
int sock_fds[2], i; int sock_fds[2], i;
LCL_Initialise(); LCL_Initialise();