From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 7 Jan 2012 09:29:19 +0000 (+0100)
Subject: _gnutls_proc_cert_client_certificate and _gnutls_proc_cert_server_certificate renamed... 
X-Git-Tag: gnutls-3_0_12~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c21d24edeced2ff0b06418c25c4fdfa77b6e4e97;p=thirdparty%2Fgnutls.git

_gnutls_proc_cert_client_certificate and _gnutls_proc_cert_server_certificate renamed to _gnutls_proc_certificate.
---

diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index cdd0d70b34..38d2c0047b 100644
--- 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 176d214999..7ef0e92dfe 100644
--- 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 87496af17d..c21405df20 100644
--- 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 d07e5e5708..0806d0311c 100644
--- 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 fca2826a63..4bd9750a33 100644
--- 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 614425b343..e3b8785e03 100644
--- 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,