cleanup: use ssh_ prefix in the buffer (non-static) functions

Having "ssh_" prefix in the functions' name will avoid possible clashes
when compiling libssh statically.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/curve25519.c b/src/curve25519.c
index 99d7145b..eead77c6 100644
--- a/src/curve25519.c
+++ b/src/curve25519.c
@@ -106,7 +106,7 @@ int ssh_client_curve25519_reply(ssh_session session, ssh_buffer packet){
   ssh_string pubkey = NULL;
   ssh_string signature = NULL;
   int rc;
-  pubkey = buffer_get_ssh_string(packet);
+  pubkey = ssh_buffer_get_ssh_string(packet);
   if (pubkey == NULL){
     ssh_set_error(session,SSH_FATAL, "No public key in packet");
     goto error;
@@ -115,7 +115,7 @@ int ssh_client_curve25519_reply(ssh_session session, ssh_buffer packet){
   session->next_crypto->server_pubkey = pubkey;
   pubkey = NULL;
 
-  q_s_string = buffer_get_ssh_string(packet);
+  q_s_string = ssh_buffer_get_ssh_string(packet);
   if (q_s_string == NULL) {
 	  ssh_set_error(session,SSH_FATAL, "No Q_S ECC point in packet");
 	  goto error;
@@ -129,7 +129,7 @@ int ssh_client_curve25519_reply(ssh_session session, ssh_buffer packet){
   memcpy(session->next_crypto->curve25519_server_pubkey, ssh_string_data(q_s_string), CURVE25519_PUBKEY_SIZE);
   ssh_string_free(q_s_string);
 
-  signature = buffer_get_ssh_string(packet);
+  signature = ssh_buffer_get_ssh_string(packet);
   if (signature == NULL) {
     ssh_set_error(session, SSH_FATAL, "No signature in packet");
     goto error;
@@ -143,7 +143,7 @@ int ssh_client_curve25519_reply(ssh_session session, ssh_buffer packet){
   }
 
   /* Send the MSG_NEWKEYS */
-  if (buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS) < 0) {
+  if (ssh_buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS) < 0) {
     goto error;
   }
 
@@ -170,7 +170,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
     int rc;
 
     /* Extract the client pubkey from the init packet */
-    q_c_string = buffer_get_ssh_string(packet);
+    q_c_string = ssh_buffer_get_ssh_string(packet);
     if (q_c_string == NULL) {
         ssh_set_error(session,SSH_FATAL, "No Q_C ECC point in packet");
         return SSH_ERROR;
@@ -196,7 +196,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
     crypto_scalarmult_base(session->next_crypto->curve25519_server_pubkey,
   		  session->next_crypto->curve25519_privkey);
 
-    rc = buffer_add_u8(session->out_buffer, SSH2_MSG_KEX_ECDH_REPLY);
+    rc = ssh_buffer_add_u8(session->out_buffer, SSH2_MSG_KEX_ECDH_REPLY);
     if (rc < 0) {
         ssh_set_error_oom(session);
         goto error;
@@ -222,7 +222,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
     }
 
     /* add host's public key */
-    rc = buffer_add_ssh_string(session->out_buffer,
+    rc = ssh_buffer_add_ssh_string(session->out_buffer,
                                session->next_crypto->server_pubkey);
     if (rc < 0) {
         ssh_set_error_oom(session);
@@ -239,7 +239,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
                     session->next_crypto->curve25519_server_pubkey,
                     CURVE25519_PUBKEY_SIZE);
 
-    rc = buffer_add_ssh_string(session->out_buffer, q_s_string);
+    rc = ssh_buffer_add_ssh_string(session->out_buffer, q_s_string);
     ssh_string_free(q_s_string);
     if (rc < 0) {
         ssh_set_error_oom(session);
@@ -252,7 +252,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
         goto error;
     }
 
-    rc = buffer_add_ssh_string(session->out_buffer, sig_blob);
+    rc = ssh_buffer_add_ssh_string(session->out_buffer, sig_blob);
     ssh_string_free(sig_blob);
     if (rc < 0) {
         ssh_set_error_oom(session);
@@ -266,7 +266,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
     }
 
     /* Send the MSG_NEWKEYS */
-    rc = buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS);
+    rc = ssh_buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS);
     if (rc < 0) {
         goto error;
     }