shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use unsigned values for length in buffer functions.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@211 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-02-02 15:39:09 +00:00
parent 7250e03f97
commit 5d798f6225
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/libssh.h
View File

@@ -315,7 +315,7 @@ void buffer_free(BUFFER *buffer);
/* buffer_get returns a pointer to the begining of the buffer. no position is taken into account */ /* 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(BUFFER *buffer);
/* same here */ /* same here */
int buffer_get_len(BUFFER *buffer); u32 buffer_get_len(BUFFER *buffer);
/* in auth.c */ /* in auth.c */

6
include/libssh/priv.h
View File

@@ -592,7 +592,7 @@ void buffer_reinit(BUFFER *buffer);
/* buffer_get_rest returns a pointer to the current position into the buffer */ /* buffer_get_rest returns a pointer to the current position into the buffer */
void *buffer_get_rest(BUFFER *buffer); void *buffer_get_rest(BUFFER *buffer);
/* buffer_get_rest_len returns the number of bytes which can be read */ /* buffer_get_rest_len returns the number of bytes which can be read */
int buffer_get_rest_len(BUFFER *buffer); u32 buffer_get_rest_len(BUFFER *buffer);
/* buffer_read_*() returns the number of bytes read, except for ssh strings */ /* buffer_read_*() returns the number of bytes read, except for ssh strings */
int buffer_get_u8(BUFFER *buffer,u8 *data); int buffer_get_u8(BUFFER *buffer,u8 *data);
@@ -605,8 +605,8 @@ STRING *buffer_get_ssh_string(BUFFER *buffer);
/* gets a string out of a SSH-1 mpint */ /* gets a string out of a SSH-1 mpint */
STRING *buffer_get_mpint(BUFFER *buffer); STRING *buffer_get_mpint(BUFFER *buffer);
/* buffer_pass_bytes acts as if len bytes have been read (used for padding) */ /* buffer_pass_bytes acts as if len bytes have been read (used for padding) */
int buffer_pass_bytes_end(BUFFER *buffer, u32 len); u32 buffer_pass_bytes_end(BUFFER *buffer, u32 len);
int buffer_pass_bytes(BUFFER *buffer, u32 len); u32 buffer_pass_bytes(BUFFER *buffer, u32 len);
/* in base64.c */ /* in base64.c */
BUFFER *base64_to_bin(char *source); BUFFER *base64_to_bin(char *source);

8
libssh/buffer.c
View File

@@ -174,7 +174,7 @@ void *buffer_get_rest(BUFFER *buffer){
* \return length of the buffer * \return length of the buffer
* \see buffer_get() * \see buffer_get()
*/ */
int buffer_get_len(BUFFER *buffer){ u32 buffer_get_len(BUFFER *buffer){
return buffer->used; return buffer->used;
} }
@@ -184,7 +184,7 @@ int buffer_get_len(BUFFER *buffer){
* \return length of the buffer * \return length of the buffer
* \see buffer_get_rest() * \see buffer_get_rest()
*/ */
int buffer_get_rest_len(BUFFER *buffer){ u32 buffer_get_rest_len(BUFFER *buffer){
return buffer->used - buffer->pos; return buffer->used - buffer->pos;
} }
@@ -195,7 +195,7 @@ int buffer_get_rest_len(BUFFER *buffer){
* \param len number of bytes to eat * \param len number of bytes to eat
* \return new size of the buffer * \return new size of the buffer
*/ */
int buffer_pass_bytes(BUFFER *buffer, u32 len){ u32 buffer_pass_bytes(BUFFER *buffer, u32 len){
if(buffer->used < buffer->pos+len) if(buffer->used < buffer->pos+len)
return 0; return 0;
buffer->pos+=len; buffer->pos+=len;
@@ -213,7 +213,7 @@ int buffer_pass_bytes(BUFFER *buffer, u32 len){
* \param len number of bytes to remove from tail * \param len number of bytes to remove from tail
* \return new size of the buffer * \return new size of the buffer
*/ */
int buffer_pass_bytes_end(BUFFER *buffer, u32 len){ u32 buffer_pass_bytes_end(BUFFER *buffer, u32 len){
if(buffer->used < buffer->pos + len) if(buffer->used < buffer->pos + len)
return 0; return 0;
buffer->used-=len; buffer->used-=len;