more cleanups

diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index d26fb6e57a2324ab349e17a4e0a50f56ccc3028c..51990f2a9b9d8fff5d2577078c06daaabdde0e88 100644 (file)
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -791,9 +791,8 @@ cleanup:
 
 }
 
-/* Generate client certificate
+/* Generate certificate message
  */
-
 static int
 _gnutls_gen_x509_crt (gnutls_session_t session, gnutls_buffer_st * data)
 {
@@ -1408,7 +1407,7 @@ cleanup:
 #endif
 
 int
-_gnutls_proc_certificate (gnutls_session_t session,
+_gnutls_proc_crt (gnutls_session_t session,
                                       uint8_t * data, size_t data_size)
 {
   int ret;
@@ -1579,7 +1578,7 @@ _gnutls_proc_cert_cert_req (gnutls_session_t session, uint8_t * data,
 }
 
 int
-_gnutls_gen_cert_client_cert_vrfy (gnutls_session_t session,
+_gnutls_gen_cert_client_crt_vrfy (gnutls_session_t session,
                                    gnutls_buffer_st * data)
 {
   int ret;
@@ -1603,7 +1602,7 @@ _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t session,
   if (apr_cert_list_length > 0)
     {
       if ((ret =
-           _gnutls_handshake_sign_cert_vrfy (session,
+           _gnutls_handshake_sign_crt_vrfy (session,
                                              &apr_cert_list[0],
                                              apr_pkey, &signature)) < 0)
         {
@@ -1661,7 +1660,7 @@ cleanup:
 }
 
 int
-_gnutls_proc_cert_client_cert_vrfy (gnutls_session_t session,
+_gnutls_proc_cert_client_crt_vrfy (gnutls_session_t session,
                                     uint8_t * data, size_t data_size)
 {
   int size, ret;
@@ -1724,7 +1723,7 @@ _gnutls_proc_cert_client_cert_vrfy (gnutls_session_t session,
     }
 
   if ((ret =
-       _gnutls_handshake_verify_cert_vrfy (session, &peer_cert, &sig,
+       _gnutls_handshake_verify_crt_vrfy (session, &peer_cert, &sig,
                                            sign_algo)) < 0)
     {
       gnutls_assert ();

diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index c64bf2e260f394c436b60a04972c6a634c76e171..fd4e5a42be7e2eb4bbe2b11966ef18e1001a1e14 100644 (file)
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -124,11 +124,11 @@ void _gnutls_free_rsa_info (rsa_info_st * rsa);
 /* AUTH X509 functions */
 int _gnutls_gen_cert_server_crt (gnutls_session_t, gnutls_buffer_st *);
 int _gnutls_gen_cert_client_crt (gnutls_session_t, gnutls_buffer_st *);
-int _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t, gnutls_buffer_st *);
+int _gnutls_gen_cert_client_crt_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, uint8_t *, size_t);
-int _gnutls_proc_cert_client_cert_vrfy (gnutls_session_t, uint8_t *, size_t);
-int _gnutls_proc_certificate (gnutls_session_t, uint8_t *, size_t);
+int _gnutls_proc_cert_client_crt_vrfy (gnutls_session_t, uint8_t *, size_t);
+int _gnutls_proc_crt (gnutls_session_t, uint8_t *, size_t);
 int _gnutls_get_selected_cert (gnutls_session_t session,
                                gnutls_pcert_st ** apr_cert_list,
                                int *apr_cert_list_length,

diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c
index 659ee983916553712067cac752b2cb988bdaac66..4fb59d42e850313fa37eba7b5cde8610f16e19bf 100644 (file)
--- a/lib/auth/dhe.c
+++ b/lib/auth/dhe.c
@@ -49,14 +49,14 @@ const mod_auth_st ecdhe_ecdsa_auth_struct = {
   _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_ecdh_common_client_kx,   /* This is the only different */
-  _gnutls_gen_cert_client_cert_vrfy,
+  _gnutls_gen_cert_client_crt_vrfy,
   _gnutls_gen_cert_server_cert_req,
 
-  _gnutls_proc_certificate,
-  _gnutls_proc_certificate,
+  _gnutls_proc_crt,
+  _gnutls_proc_crt,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
-  _gnutls_proc_cert_client_cert_vrfy,
+  _gnutls_proc_cert_client_crt_vrfy,
   _gnutls_proc_cert_cert_req
 };
 
@@ -66,14 +66,14 @@ const mod_auth_st ecdhe_rsa_auth_struct = {
   _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_ecdh_common_client_kx,   /* This is the only different */
-  _gnutls_gen_cert_client_cert_vrfy,
+  _gnutls_gen_cert_client_crt_vrfy,
   _gnutls_gen_cert_server_cert_req,
 
-  _gnutls_proc_certificate,
-  _gnutls_proc_certificate,
+  _gnutls_proc_crt,
+  _gnutls_proc_crt,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
-  _gnutls_proc_cert_client_cert_vrfy,
+  _gnutls_proc_cert_client_crt_vrfy,
   _gnutls_proc_cert_cert_req
 };
 
@@ -83,14 +83,14 @@ const mod_auth_st dhe_rsa_auth_struct = {
   _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_dh_common_client_kx,
-  _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
+  _gnutls_gen_cert_client_crt_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_certificate,
-  _gnutls_proc_certificate,
+  _gnutls_proc_crt,
+  _gnutls_proc_crt,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
-  _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */
+  _gnutls_proc_cert_client_crt_vrfy,   /* proc client cert vrfy */
   _gnutls_proc_cert_cert_req    /* proc server cert request */
 };
 
@@ -100,14 +100,14 @@ const mod_auth_st dhe_dss_auth_struct = {
   _gnutls_gen_cert_client_crt,
   gen_dhe_server_kx,
   _gnutls_gen_dh_common_client_kx,
-  _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
+  _gnutls_gen_cert_client_crt_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_certificate,
-  _gnutls_proc_certificate,
+  _gnutls_proc_crt,
+  _gnutls_proc_crt,
   proc_dhe_server_kx,
   proc_dhe_client_kx,
-  _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */
+  _gnutls_proc_cert_client_crt_vrfy,   /* proc client cert vrfy */
   _gnutls_proc_cert_cert_req    /* proc server cert request */
 };
 

diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c
index 8658d4abc2b1fecdd9ba8e531e420e6af252e7e4..77a61f98141061aa8969df2e3247bf6ceb3c8108 100644 (file)
--- a/lib/auth/rsa.c
+++ b/lib/auth/rsa.c
@@ -50,14 +50,14 @@ const mod_auth_st rsa_auth_struct = {
   _gnutls_gen_cert_client_crt,
   NULL,                         /* gen server kx */
   _gnutls_gen_rsa_client_kx,
-  _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
+  _gnutls_gen_cert_client_crt_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_certificate,
-  _gnutls_proc_certificate,
+  _gnutls_proc_crt,
+  _gnutls_proc_crt,
   NULL,                         /* proc server kx */
   proc_rsa_client_kx,           /* proc client kx */
-  _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */
+  _gnutls_proc_cert_client_crt_vrfy,   /* proc client cert vrfy */
   _gnutls_proc_cert_cert_req    /* proc server cert request */
 };
 

diff --git a/lib/auth/rsa_export.c b/lib/auth/rsa_export.c
index fce57894f37544456334c3ef303e23860a6c6079..f93211d8319fca0265bad0cd55f774dec1b38277 100644 (file)
--- a/lib/auth/rsa_export.c
+++ b/lib/auth/rsa_export.c
@@ -54,14 +54,14 @@ const mod_auth_st rsa_export_auth_struct = {
   _gnutls_gen_cert_client_crt,
   gen_rsa_export_server_kx,
   _gnutls_gen_rsa_client_kx,
-  _gnutls_gen_cert_client_cert_vrfy,    /* gen client cert vrfy */
+  _gnutls_gen_cert_client_crt_vrfy,    /* gen client cert vrfy */
   _gnutls_gen_cert_server_cert_req,     /* server cert request */
 
-  _gnutls_proc_certificate,
-  _gnutls_proc_certificate,
+  _gnutls_proc_crt,
+  _gnutls_proc_crt,
   proc_rsa_export_server_kx,
   proc_rsa_export_client_kx,    /* proc client kx */
-  _gnutls_proc_cert_client_cert_vrfy,   /* proc client cert vrfy */
+  _gnutls_proc_cert_client_crt_vrfy,   /* proc client cert vrfy */
   _gnutls_proc_cert_cert_req    /* proc server cert request */
 };
 

diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c
index 3a3649f64b3bf4162ab84fe88ab52344d40b7f22..135b76215d731015ba2b3096d2e0e863208c6ca7 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_certificate,
+  _gnutls_proc_crt,
   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_certificate,
+  _gnutls_proc_crt,
   NULL,                         /* certificate */
   proc_srp_cert_server_kx,
   _gnutls_proc_srp_client_kx,