diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2022-10-12 11:51:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 11:51:31 +0300 |
| commit | 490d39f58056fd2f0433e11dc7629528587172c3 (patch) | |
| tree | 1357f257ee6e9f8d676ab0dd37de59e85919e686 | |
| parent | bf4fa9fabfd026faa29084cba5b31980f2f80cc8 (diff) | |
| parent | e124499e27d48b85ca5fc2734247c47b94ee8ba5 (diff) | |
Merge pull request #1292 from konstruktoid/issue1291
Only test Compression if sshd version < 7.4
| -rw-r--r-- | include/tests_ssh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/tests_ssh b/include/tests_ssh index de3209ee..fb784d83 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -135,7 +135,6 @@ SSHOPS="AllowTcpForwarding:NO,LOCAL,YES:=\ ClientAliveCountMax:2,4,16:<\ ClientAliveInterval:300,600,900:<\ - Compression:NO,,YES:=\ FingerprintHash:SHA256,MD5,:=\ GatewayPorts:NO,,YES:=\ IgnoreRhosts:YES,,NO:=\ @@ -158,12 +157,12 @@ # OpenSSH had some options removed over time. Based on the version we add some additional options to check if [ ${OPENSSHD_VERSION_MAJOR} -lt 7 ]; then LogText "Result: added additional options for OpenSSH 6.x and lower" - SSHOPS="${SSHOPS} UsePrivilegeSeparation:SANDBOX,YES,NO:= Protocol:2,,1:=" + SSHOPS="${SSHOPS} Compression:(DELAYED|NO),,YES:= UsePrivilegeSeparation:SANDBOX,YES,NO:= Protocol:2,,1:=" elif [ ${OPENSSHD_VERSION_MAJOR} -eq 7 ]; then # Protocol 1 support removed (OpenSSH 7.4 and later) if [ ${OPENSSHD_VERSION_MINOR} -lt 4 ]; then LogText "Result: added additional options for OpenSSH < 7.4" - SSHOPS="${SSHOPS} Protocol:2,,1:=" + SSHOPS="${SSHOPS} Compression:(DELAYED|NO),,YES:= Protocol:2,,1:=" fi # UsePrivilegedSeparation removed (OpenSSH 7.5 and later) if [ ${OPENSSHD_VERSION_MINOR} -lt 5 ]; then |