aboutsummaryrefslogtreecommitdiff
path: root/libssh/packet.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2005-08-07 10:48:08 +0000
committerAris Adamantiadis <aris@0xbadc0de.be>2005-08-07 10:48:08 +0000
commit5c26ae735483d140f802d58b1872b2fe9468d219 (patch)
treee8e8e8dea72c371e15f6e510ecc97948a4139383 /libssh/packet.c
parent3113d8756628f463fda33b93801aee3c6ee9aa32 (diff)
downloadlibssh-5c26ae735483d140f802d58b1872b2fe9468d219.tar.gz
libssh-5c26ae735483d140f802d58b1872b2fe9468d219.tar.xz
libssh-5c26ae735483d140f802d58b1872b2fe9468d219.zip
server kex done :)
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@6 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/packet.c')
-rw-r--r--libssh/packet.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libssh/packet.c b/libssh/packet.c
index 89132f9c..0f86f61a 100644
--- a/libssh/packet.c
+++ b/libssh/packet.c
@@ -138,7 +138,7 @@ static int packet_read2(SSH_SESSION *session){
ssh_set_error(session,SSH_FATAL,"Packet too short to read padding");
return -1;
}
- ssh_say(3,"%hhd bytes padding\n",padding);
+ ssh_say(3,"%hhd bytes padding, %d bytes left in buffer\n",padding,buffer_get_rest_len(session->in_buffer));
if(padding > buffer_get_rest_len(session->in_buffer)){
ssh_set_error(session,SSH_FATAL,"invalid padding: %d (%d resting)",padding,buffer_get_rest_len(session->in_buffer));
#ifdef DEBUG_CRYPTO
@@ -147,8 +147,10 @@ static int packet_read2(SSH_SESSION *session){
return -1;
}
buffer_pass_bytes_end(session->in_buffer,padding);
+ ssh_say(3,"After padding, %d bytes left in buffer\n",buffer_get_rest_len(session->in_buffer));
#ifdef HAVE_LIBZ
if(session->current_crypto && session->current_crypto->do_compress_in){
+ ssh_say(3,"Decompressing ...\n");
decompress_buffer(session,session->in_buffer);
}
#endif
@@ -320,6 +322,7 @@ static int packet_send2(SSH_SESSION *session){
ssh_say(3,"Writing on the wire a packet having %ld bytes before",currentlen);
#ifdef HAVE_LIBZ
if(session->current_crypto && session->current_crypto->do_compress_out){
+ ssh_say(3,"Compressing ...\n");
compress_buffer(session,session->out_buffer);
currentlen=buffer_get_len(session->out_buffer);
}
@@ -328,7 +331,7 @@ static int packet_send2(SSH_SESSION *session){
if(padding<4)
padding+=blocksize;
if(session->current_crypto)
- ssh_get_random(padstring,padding);
+ ssh_get_random(padstring,padding,0);
else
memset(padstring,0,padding);
finallen=htonl(currentlen+padding+1);