shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Begining of zlib@openssh.org implementation

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-07-23 16:49:28 +02:00
parent b4c0b03694
commit d688ed2553
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/crypto.h
View File

@@ -58,6 +58,8 @@ struct ssh_crypto_struct {
const char *server_pubkey_type; const char *server_pubkey_type;
int do_compress_out; /* idem */ int do_compress_out; /* idem */
int do_compress_in; /* don't set them, set the option instead */ int do_compress_in; /* don't set them, set the option instead */
int delayed_compress_in; /* Use of zlib@openssh.org */
int delayed_compress_out;
void *compress_out_ctx; /* don't touch it */ void *compress_out_ctx; /* don't touch it */
void *compress_in_ctx; /* really, don't */ void *compress_in_ctx; /* really, don't */
}; };

2
libssh/kex.c
View File

@@ -67,7 +67,7 @@
#endif #endif
#if defined(HAVE_LIBZ) && defined(WITH_LIBZ) #if defined(HAVE_LIBZ) && defined(WITH_LIBZ)
#define ZLIB "none,zlib" #define ZLIB "none,zlib,zlib@openssh.org"
#else #else
#define ZLIB "none" #define ZLIB "none"
#endif #endif

11
libssh/wrapper.c
View File

@@ -161,13 +161,18 @@ static int crypt_set_algorithms2(ssh_session session){
} }
/* compression */ /* compression */
if (strstr(session->client_kex.methods[SSH_COMP_C_S], "zlib")) { if (strcmp(session->client_kex.methods[SSH_COMP_C_S], "zlib") == 0) {
session->next_crypto->do_compress_out = 1; session->next_crypto->do_compress_out = 1;
} }
if (strstr(session->client_kex.methods[SSH_COMP_S_C], "zlib")) { if (strcmp(session->client_kex.methods[SSH_COMP_S_C], "zlib") == 0) {
session->next_crypto->do_compress_in = 1; session->next_crypto->do_compress_in = 1;
} }
if (strcmp(session->client_kex.methods[SSH_COMP_C_S], "zlib@openssh.org") == 0) {
session->next_crypto->delayed_compress_out = 1;
}
if (strcmp(session->client_kex.methods[SSH_COMP_S_C], "zlib@openssh.org") == 0) {
session->next_crypto->delayed_compress_in = 1;
}
return SSH_OK; return SSH_OK;
} }