diff options
Diffstat (limited to 'tests/torture.c')
| -rw-r--r-- | tests/torture.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/torture.c b/tests/torture.c index 738cacc9..30f9ab36 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -802,9 +802,22 @@ static void torture_setup_create_sshd_config(void **state) "UsePrivilegeSeparation no\n" "StrictModes no\n" "\n" - "Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,blowfish-cbc\n" - "KexAlgorithms +diffie-hellman-group1-sha1\n" +#if OPENSSH_VERSION_MAJOR == 6 && OPENSSH_VERSION_MINOR >= 7 "HostKeyAlgorithms +ssh-dss\n" + "Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,blowfish-cbc\n" + "KexAlgorithms +diffie-hellman-group1-sha1" +#else + "Ciphers 3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,aes128-ctr," + "aes192-ctr,aes256-ctr,aes128-gcm@openssh.com," + "aes256-gcm@openssh.com,arcfour128,arcfour256,arcfour," + "blowfish-cbc,cast128-cbc,chacha20-poly1305@openssh.com\n" + "KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp256," + "ecdh-sha2-nistp384,ecdh-sha2-nistp521," + "diffie-hellman-group-exchange-sha256," + "diffie-hellman-group-exchange-sha1," + "diffie-hellman-group14-sha1," + "diffie-hellman-group1-sha1\n" +#endif "\n" "AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES\n" "AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n" |