lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-31 00:03:07 +03:00
Code Activity

Remove zlib from the default compression methods and fips methods

Browse Source 
Signed-off-by: Khalid Mamdouh <khalidmamdou7@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
khalid
2023-03-15 01:58:01 +02:00
committed by Jakub Jelen
parent cb19677d2e
commit f9147a3cf4
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/kex.c
View File

@ -89,8 +89,10 @@
#ifdef WITH_ZLIB #ifdef WITH_ZLIB
#define ZLIB "none,zlib@openssh.com,zlib" #define ZLIB "none,zlib@openssh.com,zlib"
#define ZLIB_DEFAULT "none,zlib@openssh.com"
#else #else
#define ZLIB "none" #define ZLIB "none"
#define ZLIB_DEFAULT "none"
#endif /* WITH_ZLIB */ #endif /* WITH_ZLIB */
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
@ -216,8 +218,8 @@ static const char *fips_methods[] = {
FIPS_ALLOWED_CIPHERS, FIPS_ALLOWED_CIPHERS,
FIPS_ALLOWED_MACS, FIPS_ALLOWED_MACS,
FIPS_ALLOWED_MACS, FIPS_ALLOWED_MACS,
ZLIB, ZLIB_DEFAULT,
ZLIB, ZLIB_DEFAULT,
"", "",
"", "",
NULL NULL
@ -231,8 +233,8 @@ static const char *default_methods[] = {
CHACHA20 AES, CHACHA20 AES,
"hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512", "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512",
"hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512", "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512",
ZLIB, ZLIB_DEFAULT,
ZLIB, ZLIB_DEFAULT,
"", "",
"", "",
NULL NULL

22
tests/client/torture_algorithms.c
View File

@ -594,24 +594,34 @@ static void torture_algorithms_zlib(void **state) {
rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_C_S, "zlib"); rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_C_S, "zlib");
#ifdef WITH_ZLIB #ifdef WITH_ZLIB
assert_int_equal(rc, SSH_OK); if (ssh_fips_mode()) {
assert_int_equal(rc, SSH_ERROR);
} else {
assert_int_equal(rc, SSH_OK);
}
#else #else
assert_int_equal(rc, SSH_ERROR); assert_int_equal(rc, SSH_ERROR);
#endif #endif
rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_S_C, "zlib"); rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_S_C, "zlib");
#ifdef WITH_ZLIB #ifdef WITH_ZLIB
assert_int_equal(rc, SSH_OK); if (ssh_fips_mode()) {
assert_int_equal(rc, SSH_ERROR);
} else {
assert_int_equal(rc, SSH_OK);
}
#else #else
assert_int_equal(rc, SSH_ERROR); assert_int_equal(rc, SSH_ERROR);
#endif #endif
rc = ssh_connect(session); rc = ssh_connect(session);
#ifdef WITH_ZLIB #ifdef WITH_ZLIB
if (ssh_get_openssh_version(session)) { if (!ssh_fips_mode()) {
assert_false(rc == SSH_OK); if (ssh_get_openssh_version(session)) {
ssh_disconnect(session); assert_false(rc == SSH_OK);
return; ssh_disconnect(session);
return;
}
} }
#endif #endif
assert_int_equal(rc, SSH_OK); assert_int_equal(rc, SSH_OK);