renamed function names for clarity.

This commit is contained in:
Nikos Mavrogiannopoulos
2014-04-16 11:49:13 +02:00
parent 4037bed48b
commit 3f8661a98a
3 changed files with 5 additions and 5 deletions

View File

@@ -885,7 +885,7 @@ int main(int argc, char** argv)
run_sec_mod(&s);
/* Initialize certificates */
tls_global_init_certs(&s);
tls_load_certs(&s);
mslog(&s, NULL, LOG_INFO, "initialized %s", PACKAGE_STRING);

View File

@@ -483,7 +483,7 @@ static void key_cb_deinit_func(gnutls_privkey_t key, void* userdata)
}
static
int load_key_files(main_server_st *s)
int load_cert_files(main_server_st *s)
{
int ret;
gnutls_pcert_st *pcert_list;
@@ -549,7 +549,7 @@ struct key_cb_data * cdata;
}
/* reload key files etc. */
void tls_global_init_certs(main_server_st* s)
void tls_load_certs(main_server_st* s)
{
int ret;
const char* perr;
@@ -574,7 +574,7 @@ const char* perr;
certificate_check(s);
ret = load_key_files(s);
ret = load_cert_files(s);
if (ret < 0) {
mslog(s, NULL, LOG_ERR, "error loading the certificate or key file");
exit(1);

View File

@@ -44,7 +44,7 @@ int tls_uncork(gnutls_session_t session);
void tls_reload_crl(struct main_server_st* s);
void tls_global_init(struct main_server_st* s);
void tls_global_deinit(struct main_server_st* s);
void tls_global_init_certs(struct main_server_st* s);
void tls_load_certs(struct main_server_st* s);
ssize_t tls_send_file(gnutls_session_t session, const char *file);
size_t tls_get_overhead(gnutls_protocol_t, gnutls_cipher_algorithm_t, gnutls_mac_algorithm_t);