Rationalized function names for signature generation and verification during handshake.

_gnutls_tls_sign_hdata -> _gnutls_handshake_sign_cert_vrfy
_gnutls_verify_sig_hdata -> _gnutls_handshake_verify_cert_vrfy
_gnutls_tls_sign_params -> _gnutls_handshake_sign_data
_gnutls_verify_sig_params -> _gnutls_handshake_verify_data

6 files changed, 22 insertions, 22 deletions

diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index 5bd767e124..15168c183c 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -1438,7 +1438,7 @@ _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t session, opaque ** data)
   if (apr_cert_list_length > 0)
     {
       if ((ret =
-	   _gnutls_tls_sign_hdata (session,
+	   _gnutls_handshake_sign_cert_vrfy (session,
 				   &apr_cert_list[0],
 				   apr_pkey, &signature)) < 0)
 	{
@@ -1545,7 +1545,7 @@ _gnutls_proc_cert_client_cert_vrfy (gnutls_session_t session,
       return ret;
     }
 
-  if ((ret = _gnutls_verify_sig_hdata (session, &peer_cert, &sig, sign_algo)) < 0)
+  if ((ret = _gnutls_handshake_verify_cert_vrfy (session, &peer_cert, &sig, sign_algo)) < 0)
     {
       gnutls_assert ();
       _gnutls_gcert_deinit (&peer_cert);
diff --git a/lib/auth_dhe.c b/lib/auth_dhe.c
index f36afa0cf8..9ce38a6f06 100644
--- a/lib/auth_dhe.c
+++ b/lib/auth_dhe.c
@@ -148,7 +148,7 @@ gen_dhe_server_kx (gnutls_session_t session, opaque ** data)
   if (apr_cert_list_length > 0)
     {
       if ((ret =
-	   _gnutls_tls_sign_params (session, &apr_cert_list[0],
+	   _gnutls_handshake_sign_data (session, &apr_cert_list[0],
 				    apr_pkey, &ddata, &signature,
 				    &sign_algo)) < 0)
 	{
@@ -261,7 +261,7 @@ proc_dhe_server_kx (gnutls_session_t session, opaque * data,
       return ret;
     }
 
-  ret = _gnutls_verify_sig_params (session, &peer_cert, &vparams, &signature,
+  ret = _gnutls_handshake_verify_data (session, &peer_cert, &vparams, &signature,
 				   sign_algo);
 
   _gnutls_gcert_deinit (&peer_cert);
diff --git a/lib/auth_rsa_export.c b/lib/auth_rsa_export.c
index 14a9fba4db..789a9498d5 100644
--- a/lib/auth_rsa_export.c
+++ b/lib/auth_rsa_export.c
@@ -154,7 +154,7 @@ gen_rsa_export_server_kx (gnutls_session_t session, opaque ** data)
   if (apr_cert_list_length > 0)
     {
       if ((ret =
-	   _gnutls_tls_sign_params (session, &apr_cert_list[0],
+	   _gnutls_handshake_sign_data (session, &apr_cert_list[0],
 				    apr_pkey, &ddata, &signature,
 				    &sign_algo)) < 0)
 	{
@@ -310,7 +310,7 @@ proc_rsa_export_server_kx (gnutls_session_t session,
       return ret;
     }
 
-  ret = _gnutls_verify_sig_params (session, &peer_cert, &vparams, &signature,
+  ret = _gnutls_handshake_verify_data (session, &peer_cert, &vparams, &signature,
 				   GNUTLS_SIGN_UNKNOWN);
 
   _gnutls_gcert_deinit (&peer_cert);
diff --git a/lib/auth_srp_rsa.c b/lib/auth_srp_rsa.c
index 051e1c14f7..e3192f751f 100644
--- a/lib/auth_srp_rsa.c
+++ b/lib/auth_srp_rsa.c
@@ -116,7 +116,7 @@ gen_srp_cert_server_kx (gnutls_session_t session, opaque ** data)
     }
 
   if ((ret =
-       _gnutls_tls_sign_params (session, &apr_cert_list[0],
+       _gnutls_handshake_sign_data (session, &apr_cert_list[0],
 				apr_pkey, &ddata, &signature,
 				&sign_algo)) < 0)
     {
@@ -193,7 +193,7 @@ proc_srp_cert_server_kx (gnutls_session_t session, opaque * data,
       return ret;
     }
 
-  ret = _gnutls_verify_sig_params (session, &peer_cert, &vparams, &signature,
+  ret = _gnutls_handshake_verify_data (session, &peer_cert, &vparams, &signature,
 				   GNUTLS_SIGN_UNKNOWN);
 
   _gnutls_gcert_deinit (&peer_cert);
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 3a8b14dc11..115bf17ebe 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -125,7 +125,7 @@ _gnutls_rsa_encode_sig (gnutls_mac_algorithm_t algo,
  * Used in DHE_* ciphersuites.
  */
 int
-_gnutls_tls_sign_params (gnutls_session_t session, gnutls_cert * cert,
+_gnutls_handshake_sign_data (gnutls_session_t session, gnutls_cert * cert,
 			 gnutls_privkey * pkey, gnutls_datum_t * params,
 			 gnutls_datum_t * signature,
 			 gnutls_sign_algorithm_t * sign_algo)
@@ -379,7 +379,7 @@ _gnutls_verify_sig (gnutls_cert * cert,
  * Used in DHE_* ciphersuites.
  */
 int
-_gnutls_verify_sig_params (gnutls_session_t session, gnutls_cert * cert,
+_gnutls_handshake_verify_data (gnutls_session_t session, gnutls_cert * cert,
 			   const gnutls_datum_t * params,
 			   gnutls_datum_t * signature,
 			   gnutls_sign_algorithm_t algo)
@@ -470,9 +470,9 @@ _gnutls_verify_sig_params (gnutls_session_t session, gnutls_cert * cert,
 /* Client certificate verify calculations
  */
 
-/* this is _gnutls_verify_sig_hdata for TLS 1.2
+/* this is _gnutls_handshake_verify_cert_vrfy for TLS 1.2
  */
-static int _gnutls_tls12_verify_sig_hdata (gnutls_session_t session, gnutls_cert * cert,
+static int _gnutls_handshake_verify_cert_vrfy12 (gnutls_session_t session, gnutls_cert * cert,
 			  gnutls_datum_t * signature, gnutls_sign_algorithm_t sign_algo)
 {
   int ret;
@@ -527,7 +527,7 @@ static int _gnutls_tls12_verify_sig_hdata (gnutls_session_t session, gnutls_cert
  * verify message). 
  */
 int
-_gnutls_verify_sig_hdata (gnutls_session_t session, gnutls_cert * cert,
+_gnutls_handshake_verify_cert_vrfy (gnutls_session_t session, gnutls_cert * cert,
 			  gnutls_datum_t * signature, gnutls_sign_algorithm_t sign_algo)
 {
   int ret;
@@ -539,7 +539,7 @@ _gnutls_verify_sig_hdata (gnutls_session_t session, gnutls_cert * cert,
 
   if (session->security_parameters.handshake_mac_handle_type == HANDSHAKE_MAC_TYPE_12)
     {
-      return _gnutls_tls12_verify_sig_hdata(session, cert, signature, sign_algo);
+      return _gnutls_handshake_verify_cert_vrfy12(session, cert, signature, sign_algo);
     }
   else if (session->security_parameters.handshake_mac_handle_type != HANDSHAKE_MAC_TYPE_10)
     {
@@ -600,9 +600,9 @@ _gnutls_verify_sig_hdata (gnutls_session_t session, gnutls_cert * cert,
 
 }
 
-/* the same as _gnutls_tls_sign_hdata except that it is made for TLS 1.2
+/* the same as _gnutls_handshake_sign_cert_vrfy except that it is made for TLS 1.2
  */
-static int _gnutls_tls12_sign_hdata (gnutls_session_t session,
+static int _gnutls_handshake_sign_cert_vrfy12 (gnutls_session_t session,
 			gnutls_cert * cert, gnutls_privkey * pkey,
 			gnutls_datum_t * signature)
 {
@@ -677,7 +677,7 @@ static int _gnutls_tls12_sign_hdata (gnutls_session_t session,
  * For TLS1.2 returns the signature algorithm used on success, or a negative value;
  */
 int
-_gnutls_tls_sign_hdata (gnutls_session_t session,
+_gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
 			gnutls_cert * cert, gnutls_privkey * pkey,
 			gnutls_datum_t * signature)
 {
@@ -690,7 +690,7 @@ _gnutls_tls_sign_hdata (gnutls_session_t session,
 
   if (session->security_parameters.handshake_mac_handle_type == HANDSHAKE_MAC_TYPE_12)
     {
-      return _gnutls_tls12_sign_hdata(session, cert, pkey, signature);
+      return _gnutls_handshake_sign_cert_vrfy12(session, cert, pkey, signature);
     }
   else if (session->security_parameters.handshake_mac_handle_type != HANDSHAKE_MAC_TYPE_10)
     {
diff --git a/lib/gnutls_sig.h b/lib/gnutls_sig.h
index 4cc0df20c1..53e27ca956 100644
--- a/lib/gnutls_sig.h
+++ b/lib/gnutls_sig.h
@@ -25,23 +25,23 @@
 #ifndef GNUTLS_SIG_H
 # define GNUTLS_SIG_H
 
-int _gnutls_tls_sign_hdata (gnutls_session_t session,
+int _gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
 			    gnutls_cert * cert,
 			    gnutls_privkey * pkey,
 			    gnutls_datum_t * signature);
 
-int _gnutls_tls_sign_params (gnutls_session_t session,
+int _gnutls_handshake_sign_data (gnutls_session_t session,
 			     gnutls_cert * cert,
 			     gnutls_privkey * pkey,
 			     gnutls_datum_t * params,
 			     gnutls_datum_t * signature,
 			     gnutls_sign_algorithm_t * algo);
 
-int _gnutls_verify_sig_hdata (gnutls_session_t session,
+int _gnutls_handshake_verify_cert_vrfy (gnutls_session_t session,
 			      gnutls_cert * cert, gnutls_datum_t * signature,
 			      gnutls_sign_algorithm_t);
 
-int _gnutls_verify_sig_params (gnutls_session_t session,
+int _gnutls_handshake_verify_data (gnutls_session_t session,
 			       gnutls_cert * cert,
 			       const gnutls_datum_t * params,
 			       gnutls_datum_t * signature,