From f628457eef8e69f2c2857c3bcf014c207fdab5dc Mon Sep 17 00:00:00 2001 From: Tom Vrancken Date: Thu, 11 Oct 2018 21:13:45 +0200 Subject: Renamed _gnutls_server_select_cert() to _gnutls_select_server_cert() for consistency reasons with its client couterpart. Signed-off-by: Tom Vrancken --- lib/algorithms/ciphersuites.c | 4 ++-- lib/auth/cert.c | 4 ++-- lib/auth/cert.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c index ca7ca63ed9..b97bbc82db 100644 --- a/lib/algorithms/ciphersuites.c +++ b/lib/algorithms/ciphersuites.c @@ -1508,7 +1508,7 @@ _gnutls_figure_common_ciphersuite(gnutls_session_t session, if (session->key.binders[0].prf->id != session->internals.priorities->cs.entry[j]->prf) continue; } else if (cred_type == GNUTLS_CRD_CERTIFICATE) { - ret = _gnutls_server_select_cert(session, peer_clist->entry[i]); + ret = _gnutls_select_server_cert(session, peer_clist->entry[i]); if (ret < 0) { /* couldn't select cert with this ciphersuite */ gnutls_assert(); @@ -1553,7 +1553,7 @@ _gnutls_figure_common_ciphersuite(gnutls_session_t session, if (session->key.binders[0].prf->id != session->internals.priorities->cs.entry[j]->prf) break; } else if (cred_type == GNUTLS_CRD_CERTIFICATE) { - ret = _gnutls_server_select_cert(session, peer_clist->entry[i]); + ret = _gnutls_select_server_cert(session, peer_clist->entry[i]); if (ret < 0) { /* couldn't select cert with this ciphersuite */ gnutls_assert(); diff --git a/lib/auth/cert.c b/lib/auth/cert.c index 3c6fe1f4ee..574514649c 100644 --- a/lib/auth/cert.c +++ b/lib/auth/cert.c @@ -1244,7 +1244,7 @@ static void get_server_name(gnutls_session_t session, uint8_t * name, * can be selected returns an error. * * IMPORTANT - * Currently this function is only called from _gnutls_server_select_cert, + * Currently this function is only called from _gnutls_select_server_cert, * i.e. it is only called at the server. We therefore retrieve the * negotiated server certificate type within this function. * If, in the future, this routine is called at the client then we @@ -1315,7 +1315,7 @@ int cert_select_sign_algorithm(gnutls_session_t session, * */ int -_gnutls_server_select_cert(gnutls_session_t session, const gnutls_cipher_suite_entry_st *cs) +_gnutls_select_server_cert(gnutls_session_t session, const gnutls_cipher_suite_entry_st *cs) { unsigned i, j; int idx, ret; diff --git a/lib/auth/cert.h b/lib/auth/cert.h index 16dec78fd8..fe3210f922 100644 --- a/lib/auth/cert.h +++ b/lib/auth/cert.h @@ -141,7 +141,7 @@ _gnutls_select_client_cert(gnutls_session_t session, int _gnutls_pcert_to_auth_info(cert_auth_info_t info, gnutls_pcert_st * certs, size_t ncerts); int -_gnutls_server_select_cert(gnutls_session_t session, const gnutls_cipher_suite_entry_st *cs); +_gnutls_select_server_cert(gnutls_session_t session, const gnutls_cipher_suite_entry_st *cs); void _gnutls_selected_certs_deinit(gnutls_session_t session); int _gnutls_get_auth_info_pcert(gnutls_pcert_st * gcert, -- cgit v1.2.1