diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-05-14 00:51:08 +0200 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-05-14 00:51:08 +0200 |
commit | b23b3f1d9951df3ea7cc074de40db04bdf0d3a1c (patch) | |
tree | d4fe8f4c4aa71c6cebe7d1d92dc25ea145d98cd1 /libssh/gzip.c | |
parent | 46b249f5ce552bba2e0a170cb0b8052b1419924b (diff) | |
download | libssh-b23b3f1d9951df3ea7cc074de40db04bdf0d3a1c.tar.gz libssh-b23b3f1d9951df3ea7cc074de40db04bdf0d3a1c.tar.xz libssh-b23b3f1d9951df3ea7cc074de40db04bdf0d3a1c.zip |
Sanitize libssh namespace + legacy wrappers
Diffstat (limited to 'libssh/gzip.c')
-rw-r--r-- | libssh/gzip.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libssh/gzip.c b/libssh/gzip.c index c9b0545..41c198e 100644 --- a/libssh/gzip.c +++ b/libssh/gzip.c @@ -58,8 +58,8 @@ static z_stream *initcompress(ssh_session session, int level) { static ssh_buffer gzip_compress(ssh_session session,ssh_buffer source,int level){ z_stream *zout = session->current_crypto->compress_out_ctx; - void *in_ptr = buffer_get(source); - unsigned long in_size = buffer_get_len(source); + void *in_ptr = ssh_buffer_get_begin(source); + unsigned long in_size = ssh_buffer_get_len(source); ssh_buffer dest = NULL; static unsigned char out_buf[BLOCKSIZE] = {0}; unsigned long len; @@ -72,7 +72,7 @@ static ssh_buffer gzip_compress(ssh_session session,ssh_buffer source,int level) } } - dest = buffer_new(); + dest = ssh_buffer_new(); if (dest == NULL) { return NULL; } @@ -84,14 +84,14 @@ static ssh_buffer gzip_compress(ssh_session session,ssh_buffer source,int level) zout->avail_out = BLOCKSIZE; status = deflate(zout, Z_PARTIAL_FLUSH); if (status != Z_OK) { - buffer_free(dest); + ssh_buffer_free(dest); ssh_set_error(session, SSH_FATAL, "status %d deflating zlib packet", status); return NULL; } len = BLOCKSIZE - zout->avail_out; if (buffer_add_data(dest, out_buf, len) < 0) { - buffer_free(dest); + ssh_buffer_free(dest); return NULL; } zout->next_out = out_buf; @@ -109,16 +109,16 @@ int compress_buffer(ssh_session session, ssh_buffer buf) { } if (buffer_reinit(buf) < 0) { - buffer_free(dest); + ssh_buffer_free(dest); return -1; } - if (buffer_add_data(buf, buffer_get(dest), buffer_get_len(dest)) < 0) { - buffer_free(dest); + if (buffer_add_data(buf, ssh_buffer_get_begin(dest), ssh_buffer_get_len(dest)) < 0) { + ssh_buffer_free(dest); return -1; } - buffer_free(dest); + ssh_buffer_free(dest); return 0; } @@ -161,7 +161,7 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t } } - dest = buffer_new(); + dest = ssh_buffer_new(); if (dest == NULL) { return NULL; } @@ -176,18 +176,18 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t if (status != Z_OK) { ssh_set_error(session, SSH_FATAL, "status %d inflating zlib packet", status); - buffer_free(dest); + ssh_buffer_free(dest); return NULL; } len = BLOCKSIZE - zin->avail_out; if (buffer_add_data(dest,out_buf,len) < 0) { - buffer_free(dest); + ssh_buffer_free(dest); return NULL; } - if (buffer_get_len(dest) > maxlen){ + if (ssh_buffer_get_len(dest) > maxlen){ /* Size of packet exceded, avoid a denial of service attack */ - buffer_free(dest); + ssh_buffer_free(dest); return NULL; } zin->next_out = out_buf; @@ -205,16 +205,16 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){ } if (buffer_reinit(buf) < 0) { - buffer_free(dest); + ssh_buffer_free(dest); return -1; } - if (buffer_add_data(buf, buffer_get(dest), buffer_get_len(dest)) < 0) { - buffer_free(dest); + if (buffer_add_data(buf, ssh_buffer_get_begin(dest), ssh_buffer_get_len(dest)) < 0) { + ssh_buffer_free(dest); return -1; } - buffer_free(dest); + ssh_buffer_free(dest); return 0; } |