aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2016-02-08 18:38:24 +0100
committerAndreas Schneider <asn@cryptomilk.org>2018-10-05 12:09:45 +0200
commit2983b21996dda7636e81f1af790e6486c2524192 (patch)
tree4acdace4a430a22ac113bfde5ed4f3abbeda73f8
parent88ae595583246a85e9ee94190987e9f6b5a647e9 (diff)
downloadlibssh-2983b21996dda7636e81f1af790e6486c2524192.tar.gz
libssh-2983b21996dda7636e81f1af790e6486c2524192.tar.xz
libssh-2983b21996dda7636e81f1af790e6486c2524192.zip
torture: Fix ssh version detection
Signed-off-by: Andreas Schneider <asn@cryptomilk.org> (cherry-picked from commit de309c51)
-rw-r--r--tests/torture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/torture.c b/tests/torture.c
index 3a9d358b..c5f57a1f 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -819,7 +819,7 @@ static void torture_setup_create_sshd_config(void **state)
"\n"
"UsePAM yes\n"
"\n"
-#if OPENSSH_VERSION_MAJOR == 6 && OPENSSH_VERSION_MINOR >= 7
+#if (OPENSSH_VERSION_MAJOR == 6 && OPENSSH_VERSION_MINOR >= 7) || (OPENSSH_VERSION_MAJOR >= 7)
"HostKeyAlgorithms +ssh-dss\n"
"Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,blowfish-cbc\n"
"KexAlgorithms +diffie-hellman-group1-sha1"