Renamed _gnutls_server_select_cert() to _gnutls_select_server_cert() for consistency...

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index ca7ca63ed939df4076a39d6e151b9ecdd954daf3..b97bbc82dbb88bd554a35247853d4dae3af293b1 100644 (file)
--- 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 3c6fe1f4ee41f477d074c5983e71ab0907fdd796..574514649c37c51b9c61270cc397725e5859f39e 100644 (file)
--- 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 16dec78fd87fb935c4676bc768ae1518829c83ad..fe3210f922bc1ec8b6a869c09d893d5e893a12ea 100644 (file)
--- 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,