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

wrapper: Reformat compression algorithms handling

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Norbert Pocs <npocs@redhat.com>
(cherry picked from commit 342b69246c)
This commit is contained in:
Jakub Jelen
2022-12-19 14:35:12 +01:00
committed by Andreas Schneider
parent 1685c14024
commit cfa95d9ead
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/wrapper.c
View File

@@ -401,7 +401,6 @@ int crypt_set_algorithms_server(ssh_session session){
struct ssh_hmac_struct *ssh_hmactab=ssh_get_hmactab(); struct ssh_hmac_struct *ssh_hmactab=ssh_get_hmactab();
int cmp; int cmp;
if (session == NULL) { if (session == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
@@ -520,12 +519,14 @@ int crypt_set_algorithms_server(ssh_session session){
/* compression */ /* compression */
method = session->next_crypto->kex_methods[SSH_COMP_C_S]; method = session->next_crypto->kex_methods[SSH_COMP_C_S];
if(strcmp(method,"zlib") == 0){ cmp = strcmp(method, "zlib");
SSH_LOG(SSH_LOG_PACKET,"enabling C->S compression"); if (cmp == 0) {
session->next_crypto->do_compress_in=1; SSH_LOG(SSH_LOG_PACKET, "enabling C->S compression");
session->next_crypto->do_compress_in = 1;
} }
if(strcmp(method,"zlib@openssh.com") == 0){ cmp = strcmp(method, "zlib@openssh.com");
SSH_LOG(SSH_LOG_PACKET,"enabling C->S delayed compression"); if (cmp == 0) {
SSH_LOG(SSH_LOG_PACKET, "enabling C->S delayed compression");
if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) { if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) {
session->next_crypto->do_compress_in = 1; session->next_crypto->do_compress_in = 1;
@@ -535,12 +536,14 @@ int crypt_set_algorithms_server(ssh_session session){
} }
method = session->next_crypto->kex_methods[SSH_COMP_S_C]; method = session->next_crypto->kex_methods[SSH_COMP_S_C];
if(strcmp(method,"zlib") == 0){ cmp = strcmp(method, "zlib");
if (cmp == 0) {
SSH_LOG(SSH_LOG_PACKET, "enabling S->C compression"); SSH_LOG(SSH_LOG_PACKET, "enabling S->C compression");
session->next_crypto->do_compress_out=1; session->next_crypto->do_compress_out = 1;
} }
if(strcmp(method,"zlib@openssh.com") == 0){ cmp = strcmp(method, "zlib@openssh.com");
SSH_LOG(SSH_LOG_PACKET,"enabling S->C delayed compression"); if (cmp == 0) {
SSH_LOG(SSH_LOG_PACKET, "enabling S->C delayed compression");
if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) { if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) {
session->next_crypto->do_compress_out = 1; session->next_crypto->do_compress_out = 1;