From 2983b21996dda7636e81f1af790e6486c2524192 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 8 Feb 2016 18:38:24 +0100 Subject: torture: Fix ssh version detection Signed-off-by: Andreas Schneider (cherry-picked from commit de309c51) --- tests/torture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3