Changed all occurences of BUFFER * to ssh_buffer

3 files changed, 47 insertions, 47 deletions

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 70631463..fc0bca9c 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -73,8 +73,8 @@ extern "C" {
 
 #ifdef SSH_SAFE_NAMESPACE
 typedef struct ssh_string_struct STRING;
-#endif
 typedef struct ssh_buffer_struct BUFFER;
+#endif
 typedef struct ssh_public_key_struct PUBLIC_KEY;
 typedef struct ssh_private_key_struct PRIVATE_KEY;
 typedef struct ssh_channel_struct CHANNEL;
@@ -294,7 +294,7 @@ int channel_write(CHANNEL *channel, const void *data, u32 len);
 int channel_send_eof(CHANNEL *channel);
 int channel_is_eof(CHANNEL *channel);
 int channel_read(CHANNEL *channel, void *dest, u32 count, int is_stderr);
-int channel_read_buffer(CHANNEL *channel, BUFFER *buffer, u32 count,
+int channel_read_buffer(CHANNEL *channel, ssh_buffer buffer, u32 count,
     int is_stderr);
 int channel_poll(CHANNEL *channel, int is_stderr);
 int channel_close(CHANNEL *channel);
@@ -357,12 +357,12 @@ int ssh_options_set_auth_callback(SSH_OPTIONS *opt, ssh_auth_callback cb,
 
 /** creates a new buffer 
  */
-BUFFER *buffer_new(void);
-void buffer_free(BUFFER *buffer);
+ssh_buffer buffer_new(void);
+void buffer_free(ssh_buffer buffer);
 /* buffer_get returns a pointer to the begining of the buffer. no position is taken into account */
-void *buffer_get(BUFFER *buffer);
+void *buffer_get(ssh_buffer buffer);
 /* same here */
-u32 buffer_get_len(BUFFER *buffer);
+u32 buffer_get_len(ssh_buffer buffer);
 
 
 /* in auth.c */
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index d6964319..ab7d8920 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -310,8 +310,8 @@ struct ssh_channel_struct {
     u32 remote_maxpacket;
     int open; /* shows if the channel is still opened */
     int delayed_close;
-    BUFFER *stdout_buffer;
-    BUFFER *stderr_buffer;
+    ssh_buffer stdout_buffer;
+    ssh_buffer stderr_buffer;
     void *userarg;
     int version;
     int blocking;
@@ -320,7 +320,7 @@ struct ssh_channel_struct {
 
 struct ssh_agent_struct {
   struct socket *sock;
-  BUFFER *ident;
+  ssh_buffer ident;
   unsigned int count;
 };
 
@@ -361,9 +361,9 @@ struct ssh_session {
                            remote host. */
     char *discon_msg; /* disconnect message from
                          the remote host */
-    BUFFER *in_buffer;
+    ssh_buffer in_buffer;
     PACKET in_packet;
-    BUFFER *out_buffer;
+    ssh_buffer out_buffer;
 
     /* the states are used by the nonblocking stuff to remember */
     /* where it was before being interrupted */
@@ -373,8 +373,8 @@ struct ssh_session {
 
     KEX server_kex;
     KEX client_kex;
-    BUFFER *in_hashbuf;
-    BUFFER *out_hashbuf;
+    ssh_buffer in_hashbuf;
+    ssh_buffer out_hashbuf;
     CRYPTO *current_crypto;
     CRYPTO *next_crypto;  /* next_crypto is going to be used after a SSH2_MSG_NEWKEYS */
 
@@ -618,7 +618,7 @@ u32 packet_decrypt_len(SSH_SESSION *session,char *crypted);
 int packet_decrypt(SSH_SESSION *session, void *packet,unsigned int len);
 unsigned char *packet_encrypt(SSH_SESSION *session,void *packet,unsigned int len);
  /* it returns the hmac buffer if exists*/
-int packet_hmac_verify(SSH_SESSION *session,BUFFER *buffer,unsigned char *mac);
+int packet_hmac_verify(SSH_SESSION *session,ssh_buffer buffer,unsigned char *mac);
 
 /* in packet.c */
 
@@ -660,19 +660,19 @@ ssh_string try_publickey_from_file(SSH_SESSION *session,
 const char *ssh_type_to_char(int type);
 int ssh_type_from_name(const char *name);
 
-PRIVATE_KEY *privatekey_make_dss(SSH_SESSION *session, BUFFER *buffer);
-PRIVATE_KEY *privatekey_make_rsa(SSH_SESSION *session, BUFFER *buffer,
+PRIVATE_KEY *privatekey_make_dss(SSH_SESSION *session, ssh_buffer buffer);
+PRIVATE_KEY *privatekey_make_rsa(SSH_SESSION *session, ssh_buffer buffer,
     const char *type);
 PRIVATE_KEY *privatekey_from_string(SSH_SESSION *session, ssh_string privkey_s);
 
-PUBLIC_KEY *publickey_make_dss(SSH_SESSION *session, BUFFER *buffer);
-PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, BUFFER *buffer, int type);
+PUBLIC_KEY *publickey_make_dss(SSH_SESSION *session, ssh_buffer buffer);
+PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, ssh_buffer buffer, int type);
 PUBLIC_KEY *publickey_from_string(SSH_SESSION *session, ssh_string pubkey_s);
 SIGNATURE *signature_from_string(SSH_SESSION *session, ssh_string signature,PUBLIC_KEY *pubkey,int needed_type);
 void signature_free(SIGNATURE *sign);
 ssh_string ssh_do_sign_with_agent(struct ssh_session *session,
     struct ssh_buffer_struct *buf, struct ssh_public_key_struct *publickey);
-ssh_string ssh_do_sign(SSH_SESSION *session,BUFFER *sigbuf,
+ssh_string ssh_do_sign(SSH_SESSION *session,ssh_buffer sigbuf,
         PRIVATE_KEY *privatekey);
 ssh_string ssh_sign_session_id(SSH_SESSION *session, PRIVATE_KEY *privatekey);
 ssh_string ssh_encrypt_rsa1(SSH_SESSION *session, ssh_string data, PUBLIC_KEY *key);
@@ -692,41 +692,41 @@ int ssh_options_default_ssh_dir(SSH_OPTIONS *opt);
 int ssh_options_default_known_hosts_file(SSH_OPTIONS *opt);
 
 /* buffer.c */
-int buffer_add_ssh_string(BUFFER *buffer, ssh_string string);
-int buffer_add_u8(BUFFER *buffer, u8 data);
-int buffer_add_u32(BUFFER *buffer, u32 data);
-int buffer_add_u64(BUFFER *buffer, u64 data);
-int buffer_add_data(BUFFER *buffer, const void *data, u32 len);
-int buffer_prepend_data(BUFFER *buffer, const void *data, u32 len);
-int buffer_add_buffer(BUFFER *buffer, BUFFER *source);
-int buffer_reinit(BUFFER *buffer);
+int buffer_add_ssh_string(ssh_buffer buffer, ssh_string string);
+int buffer_add_u8(ssh_buffer buffer, u8 data);
+int buffer_add_u32(ssh_buffer buffer, u32 data);
+int buffer_add_u64(ssh_buffer buffer, u64 data);
+int buffer_add_data(ssh_buffer buffer, const void *data, u32 len);
+int buffer_prepend_data(ssh_buffer buffer, const void *data, u32 len);
+int buffer_add_buffer(ssh_buffer buffer, ssh_buffer source);
+int buffer_reinit(ssh_buffer buffer);
 
 /* buffer_get_rest returns a pointer to the current position into the buffer */
-void *buffer_get_rest(BUFFER *buffer);
+void *buffer_get_rest(ssh_buffer buffer);
 /* buffer_get_rest_len returns the number of bytes which can be read */
-u32 buffer_get_rest_len(BUFFER *buffer);
+u32 buffer_get_rest_len(ssh_buffer buffer);
 
 /* buffer_read_*() returns the number of bytes read, except for ssh strings */
-int buffer_get_u8(BUFFER *buffer, u8 *data);
-int buffer_get_u32(BUFFER *buffer, u32 *data);
-int buffer_get_u64(BUFFER *buffer, u64 *data);
+int buffer_get_u8(ssh_buffer buffer, u8 *data);
+int buffer_get_u32(ssh_buffer buffer, u32 *data);
+int buffer_get_u64(ssh_buffer buffer, u64 *data);
 
-u32 buffer_get_data(BUFFER *buffer, void *data, u32 requestedlen);
+u32 buffer_get_data(ssh_buffer buffer, void *data, u32 requestedlen);
 /* buffer_get_ssh_string() is an exception. if the String read is too large or invalid, it will answer NULL. */
-ssh_string buffer_get_ssh_string(BUFFER *buffer);
+ssh_string buffer_get_ssh_string(ssh_buffer buffer);
 /* gets a string out of a SSH-1 mpint */
-ssh_string buffer_get_mpint(BUFFER *buffer);
+ssh_string buffer_get_mpint(ssh_buffer buffer);
 /* buffer_pass_bytes acts as if len bytes have been read (used for padding) */
-u32 buffer_pass_bytes_end(BUFFER *buffer, u32 len);
-u32 buffer_pass_bytes(BUFFER *buffer, u32 len);
+u32 buffer_pass_bytes_end(ssh_buffer buffer, u32 len);
+u32 buffer_pass_bytes(ssh_buffer buffer, u32 len);
 
 /* in base64.c */
-BUFFER *base64_to_bin(const char *source);
+ssh_buffer base64_to_bin(const char *source);
 unsigned char *bin_to_base64(const unsigned char *source, int len);
 
 /* gzip.c */
-int compress_buffer(SSH_SESSION *session,BUFFER *buf);
-int decompress_buffer(SSH_SESSION *session,BUFFER *buf);
+int compress_buffer(SSH_SESSION *session,ssh_buffer buf);
+int decompress_buffer(SSH_SESSION *session,ssh_buffer buf);
 
 /* wrapper.c */
 int crypt_set_algorithms(SSH_SESSION *);
diff --git a/include/libssh/sftp.h b/include/libssh/sftp.h
index 446a72d1..e747e881 100644
--- a/include/libssh/sftp.h
+++ b/include/libssh/sftp.h
@@ -73,7 +73,7 @@ typedef struct sftp_session_struct {
 typedef struct {
     SFTP_SESSION *sftp;
     u8 type;
-    BUFFER *payload;
+    ssh_buffer payload;
 } SFTP_PACKET;
 
 /* file handler */
@@ -90,7 +90,7 @@ typedef struct sftp_dir {
     SFTP_SESSION *sftp;
     char *name;
     ssh_string handle; /* handle to directory */
-    BUFFER *buffer; /* contains raw attributes from server which haven't been parsed */
+    ssh_buffer buffer; /* contains raw attributes from server which haven't been parsed */
     u32 count; /* counts the number of following attributes structures into buffer */
     int eof; /* end of directory listing */
 } SFTP_DIR;
@@ -98,7 +98,7 @@ typedef struct sftp_dir {
 typedef struct {
     SFTP_SESSION *sftp;
     u8 packet_type;
-    BUFFER *payload;
+    ssh_buffer payload;
     u32 id;
 } SFTP_MESSAGE;
 
@@ -114,7 +114,7 @@ typedef struct sftp_client_message{
     u64 offset;
     u32 len;
     int attr_num;
-    BUFFER *attrbuf; /* used by sftp_reply_attrs */
+    ssh_buffer attrbuf; /* used by sftp_reply_attrs */
     ssh_string data; /* can be newpath of rename() */
 } SFTP_CLIENT_MESSAGE;
 
@@ -637,10 +637,10 @@ int sftp_server_init(SFTP_SESSION *sftp);
 /* this is not a public interface */
 #define SFTP_HANDLES 256
 SFTP_PACKET *sftp_packet_read(SFTP_SESSION *sftp);
-int sftp_packet_write(SFTP_SESSION *sftp,u8 type, BUFFER *payload);
+int sftp_packet_write(SFTP_SESSION *sftp,u8 type, ssh_buffer payload);
 void sftp_packet_free(SFTP_PACKET *packet);
-int buffer_add_attributes(BUFFER *buffer, SFTP_ATTRIBUTES *attr);
-SFTP_ATTRIBUTES *sftp_parse_attr(SFTP_SESSION *session, BUFFER *buf,int expectname);
+int buffer_add_attributes(ssh_buffer buffer, SFTP_ATTRIBUTES *attr);
+SFTP_ATTRIBUTES *sftp_parse_attr(SFTP_SESSION *session, ssh_buffer buf,int expectname);
 /* sftpserver.c */
 
 SFTP_CLIENT_MESSAGE *sftp_get_client_message(SFTP_SESSION *sftp);