From 1ef00045dde9a695e6d82fd30ed49eaebcf22095 Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Sat, 2 Nov 2013 22:30:35 -0400 Subject: server kex: enable delayed compression The code is careful to reenable compression when rekeying. Signed-off-by: Nicolas Viennot Reviewed-by: Andreas Schneider --- src/wrapper.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/wrapper.c b/src/wrapper.c index 6f57ae8..5168875 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -317,8 +317,13 @@ int crypt_set_algorithms_server(ssh_session session){ session->next_crypto->do_compress_in=1; } if(strcmp(method,"zlib@openssh.com") == 0){ - ssh_set_error(session,SSH_FATAL,"zlib@openssh.com not supported"); - return SSH_ERROR; + SSH_LOG(SSH_LOG_PACKET,"enabling C->S delayed compression"); + + if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) { + session->next_crypto->do_compress_in = 1; + } else { + session->next_crypto->delayed_compress_in = 1; + } } method = session->next_crypto->kex_methods[SSH_COMP_S_C]; @@ -327,8 +332,13 @@ int crypt_set_algorithms_server(ssh_session session){ session->next_crypto->do_compress_out=1; } if(strcmp(method,"zlib@openssh.com") == 0){ - ssh_set_error(session,SSH_FATAL,"zlib@openssh.com not supported"); - return SSH_ERROR; + SSH_LOG(SSH_LOG_PACKET,"enabling S->C delayed compression\n"); + + if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) { + session->next_crypto->do_compress_out = 1; + } else { + session->next_crypto->delayed_compress_out = 1; + } } method = session->next_crypto->kex_methods[SSH_HOSTKEYS]; -- cgit