_gnutls_proc_cert_client_certificate and _gnutls_proc_cert_server_certificate renamed...

diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index cdd0d70b34b64bf538736938de24a2290baaf744..38d2c0047b3a0ee94aac9572da5af9d00cd98b7b 100644 (file)
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -1401,7 +1401,7 @@ cleanup:
 #endif
 
 int
-_gnutls_proc_cert_server_certificate (gnutls_session_t session,
+_gnutls_proc_certificate (gnutls_session_t session,
                                       opaque * data, size_t data_size)
 {
   int ret;

diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index 176d2149997ff4b042c07322c102a3b326ffa2ba..7ef0e92dfee583e130244fc0a7d4c0b28ef732dc 100644 (file)
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -128,7 +128,7 @@ int _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t, gnutls_buffer_st *);
 int _gnutls_gen_cert_server_cert_req (gnutls_session_t, gnutls_buffer_st *);
 int _gnutls_proc_cert_cert_req (gnutls_session_t, opaque *, size_t);
 int _gnutls_proc_cert_client_cert_vrfy (gnutls_session_t, opaque *, size_t);
-int _gnutls_proc_cert_server_certificate (gnutls_session_t, opaque *, size_t);
+int _gnutls_proc_certificate (gnutls_session_t, opaque *, size_t);
 int _gnutls_get_selected_cert (gnutls_session_t session,
                                gnutls_pcert_st ** apr_cert_list,
                                int *apr_cert_list_length,
@@ -141,8 +141,6 @@ void _gnutls_selected_certs_set (gnutls_session_t session,
                                  gnutls_pcert_st * certs, int ncerts,
                                  gnutls_privkey_t key, int need_free);
 
-#define _gnutls_proc_cert_client_certificate _gnutls_proc_cert_server_certificate
-
 gnutls_rsa_params_t _gnutls_certificate_get_rsa_params (gnutls_rsa_params_t
                                                         rsa_params,
                                                         gnutls_params_function

diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c
index 87496af17d20c7c99bd3010b3502faa31fec696d..c21405df20374a62f9bc7a50c04f80b24eafe3bf 100644 (file)
--- a/lib/auth/dhe.c
+++ b/lib/auth/dhe.c
@@ -53,8 +53,8 @@ const mod_auth_st ecdhe_ecdsa_auth_struct = {
   _gnutls_gen_cert_client_cert_vrfy,
   _gnutls_gen_cert_server_cert_req,
 
-  _gnutls_proc_cert_server_certificate,
-  _gnutls_proc_cert_client_certificate,
+  _gnutls_proc_certificate,
+  _gnutls_proc_certificate,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
   _gnutls_proc_cert_client_cert_vrfy,
@@ -70,8 +70,8 @@ const mod_auth_st ecdhe_rsa_auth_struct = {
   _gnutls_gen_cert_client_cert_vrfy,
   _gnutls_gen_cert_server_cert_req,
 
-  _gnutls_proc_cert_server_certificate,
-  _gnutls_proc_cert_client_certificate,
+  _gnutls_proc_certificate,
+  _gnutls_proc_certificate,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
   _gnutls_proc_cert_client_cert_vrfy,
@@ -87,8 +87,8 @@ const mod_auth_st dhe_rsa_auth_struct = {
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_cert_server_certificate,
-  _gnutls_proc_cert_client_certificate,
+  _gnutls_proc_certificate,
+  _gnutls_proc_certificate,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
   _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */
@@ -104,8 +104,8 @@ const mod_auth_st dhe_dss_auth_struct = {
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_cert_server_certificate,
-  _gnutls_proc_cert_client_certificate,
+  _gnutls_proc_certificate,
+  _gnutls_proc_certificate,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
   _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */

diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c
index d07e5e5708c74363d7a66de8bd5c5fd9e6bbc174..0806d0311c9cffe1f84ba7679b8c5b6d1ebfe537 100644 (file)
--- a/lib/auth/rsa.c
+++ b/lib/auth/rsa.c
@@ -54,8 +54,8 @@ const mod_auth_st rsa_auth_struct = {
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_cert_server_certificate,
-  _gnutls_proc_cert_client_certificate,
+  _gnutls_proc_certificate,
+  _gnutls_proc_certificate,
   NULL,                         /* proc server kx */
   proc_rsa_client_kx,           /* proc client kx */
   _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */

diff --git a/lib/auth/rsa_export.c b/lib/auth/rsa_export.c
index fca2826a63ca2c5e3b87b9460a951360d754cc7c..4bd9750a33298ee9b2c775cd678f94dd15f926a0 100644 (file)
--- a/lib/auth/rsa_export.c
+++ b/lib/auth/rsa_export.c
@@ -58,8 +58,8 @@ const mod_auth_st rsa_export_auth_struct = {
   _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_cert_server_certificate,
-  _gnutls_proc_cert_client_certificate,
+  _gnutls_proc_certificate,
+  _gnutls_proc_certificate,
   proc_rsa_export_server_kx,
   proc_rsa_export_client_kx,    /* proc client kx */
   _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */

diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c
index 614425b3435673a039d73eff38e6979c5c4212bd..e3b8785e0311b97d34f76e369f4060d8c3c4f539 100644 (file)
--- a/lib/auth/srp_rsa.c
+++ b/lib/auth/srp_rsa.c
@@ -52,7 +52,7 @@ const mod_auth_st srp_rsa_auth_struct = {
   NULL,
   NULL,
 
-  _gnutls_proc_cert_server_certificate,
+  _gnutls_proc_certificate,
   NULL,                         /* certificate */
   proc_srp_cert_server_kx,
   _gnutls_proc_srp_client_kx,
@@ -69,7 +69,7 @@ const mod_auth_st srp_dss_auth_struct = {
   NULL,
   NULL,
 
-  _gnutls_proc_cert_server_certificate,
+  _gnutls_proc_certificate,
   NULL,                         /* certificate */
   proc_srp_cert_server_kx,
   _gnutls_proc_srp_client_kx,