lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-13 04:42:23 +03:00
Code Activity

Reformat gzip.c

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Norbert Pocs <npocs@redhat.com>
This commit is contained in:
Jakub Jelen
2022-12-19 14:13:49 +01:00
parent 6b4c2a21bc
commit c784bf345c
1 changed files with 192 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/gzip.c
View File

@@ -24,20 +24,22 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <zlib.h> #include <zlib.h>
#include "libssh/priv.h"
#include "libssh/buffer.h" #include "libssh/buffer.h"
#include "libssh/crypto.h" #include "libssh/crypto.h"
#include "libssh/priv.h"
#include "libssh/session.h" #include "libssh/session.h"
#ifndef BLOCKSIZE #ifndef BLOCKSIZE
#define BLOCKSIZE 4092 #define BLOCKSIZE 4092
#endif #endif
static z_stream *initcompress(ssh_session session, int level) { static z_stream *
initcompress(ssh_session session, int level)
{
z_stream *stream = NULL; z_stream *stream = NULL;
int status; int status;
@@ -49,15 +51,18 @@ static z_stream *initcompress(ssh_session session, int level) {
status = deflateInit(stream, level); status = deflateInit(stream, level);
if (status != Z_OK) { if (status != Z_OK) {
SAFE_FREE(stream); SAFE_FREE(stream);
ssh_set_error(session, SSH_FATAL, ssh_set_error(session,
"status %d initialising zlib deflate", status); SSH_FATAL,
"status %d initialising zlib deflate",
status);
return NULL; return NULL;
} }
return stream; return stream;
} }
static ssh_buffer gzip_compress(ssh_session session, ssh_buffer source, int level) static ssh_buffer
gzip_compress(ssh_session session, ssh_buffer source, int level)
{ {
struct ssh_crypto_struct *crypto = NULL; struct ssh_crypto_struct *crypto = NULL;
z_stream *zout = NULL; z_stream *zout = NULL;
@@ -93,8 +98,10 @@ static ssh_buffer gzip_compress(ssh_session session, ssh_buffer source, int leve
status = deflate(zout, Z_PARTIAL_FLUSH); status = deflate(zout, Z_PARTIAL_FLUSH);
if (status != Z_OK) { if (status != Z_OK) {
SSH_BUFFER_FREE(dest); SSH_BUFFER_FREE(dest);
ssh_set_error(session, SSH_FATAL, ssh_set_error(session,
"status %d deflating zlib packet", status); SSH_FATAL,
"status %d deflating zlib packet",
status);
return NULL; return NULL;
} }
len = BLOCKSIZE - zout->avail_out; len = BLOCKSIZE - zout->avail_out;
@@ -108,8 +115,11 @@ static ssh_buffer gzip_compress(ssh_session session, ssh_buffer source, int leve
return dest; return dest;
} }
int compress_buffer(ssh_session session, ssh_buffer buf) { int
compress_buffer(ssh_session session, ssh_buffer buf)
{
ssh_buffer dest = NULL; ssh_buffer dest = NULL;
int rv;
dest = gzip_compress(session, buf, session->opts.compressionlevel); dest = gzip_compress(session, buf, session->opts.compressionlevel);
if (dest == NULL) { if (dest == NULL) {
@@ -121,7 +131,10 @@ int compress_buffer(ssh_session session, ssh_buffer buf) {
return -1; return -1;
} }
if (ssh_buffer_add_data(buf, ssh_buffer_get(dest), ssh_buffer_get_len(dest)) < 0) { rv = ssh_buffer_add_data(buf,
ssh_buffer_get(dest),
ssh_buffer_get_len(dest));
if (rv < 0) {
SSH_BUFFER_FREE(dest); SSH_BUFFER_FREE(dest);
return -1; return -1;
} }
@@ -132,7 +145,9 @@ int compress_buffer(ssh_session session, ssh_buffer buf) {
/* decompression */ /* decompression */
static z_stream *initdecompress(ssh_session session) { static z_stream *
initdecompress(ssh_session session)
{
z_stream *stream = NULL; z_stream *stream = NULL;
int status; int status;
@@ -144,15 +159,18 @@ static z_stream *initdecompress(ssh_session session) {
status = inflateInit(stream); status = inflateInit(stream);
if (status != Z_OK) { if (status != Z_OK) {
SAFE_FREE(stream); SAFE_FREE(stream);
ssh_set_error(session, SSH_FATAL, ssh_set_error(session,
"Status = %d initiating inflate context!", status); SSH_FATAL,
"Status = %d initiating inflate context!",
status);
return NULL; return NULL;
} }
return stream; return stream;
} }
static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t maxlen) static ssh_buffer
gzip_decompress(ssh_session session, ssh_buffer source, size_t maxlen)
{ {
struct ssh_crypto_struct *crypto = NULL; struct ssh_crypto_struct *crypto = NULL;
z_stream *zin = NULL; z_stream *zin = NULL;
@@ -189,18 +207,20 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t
zin->avail_out = BLOCKSIZE; zin->avail_out = BLOCKSIZE;
status = inflate(zin, Z_PARTIAL_FLUSH); status = inflate(zin, Z_PARTIAL_FLUSH);
if (status != Z_OK && status != Z_BUF_ERROR) { if (status != Z_OK && status != Z_BUF_ERROR) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session,
"status %d inflating zlib packet", status); SSH_FATAL,
"status %d inflating zlib packet",
status);
SSH_BUFFER_FREE(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
} }
len = BLOCKSIZE - zin->avail_out; len = BLOCKSIZE - zin->avail_out;
if (ssh_buffer_add_data(dest,out_buf,len) < 0) { if (ssh_buffer_add_data(dest, out_buf, len) < 0) {
SSH_BUFFER_FREE(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
} }
if (ssh_buffer_get_len(dest) > maxlen){ if (ssh_buffer_get_len(dest) > maxlen) {
/* Size of packet exceeded, avoid a denial of service attack */ /* Size of packet exceeded, avoid a denial of service attack */
SSH_BUFFER_FREE(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
@@ -211,10 +231,13 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t
return dest; return dest;
} }
int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){ int
decompress_buffer(ssh_session session, ssh_buffer buf, size_t maxlen)
{
ssh_buffer dest = NULL; ssh_buffer dest = NULL;
int rv;
dest = gzip_decompress(session,buf, maxlen); dest = gzip_decompress(session, buf, maxlen);
if (dest == NULL) { if (dest == NULL) {
return -1; return -1;
} }
@@ -224,7 +247,10 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){
return -1; return -1;
} }
if (ssh_buffer_add_data(buf, ssh_buffer_get(dest), ssh_buffer_get_len(dest)) < 0) { rv = ssh_buffer_add_data(buf,
ssh_buffer_get(dest),
ssh_buffer_get_len(dest));
if (rv < 0) {
SSH_BUFFER_FREE(dest); SSH_BUFFER_FREE(dest);
return -1; return -1;
} }