aboutsummaryrefslogtreecommitdiff
path: root/tests/torture.c
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-09-29 12:00:10 +0200
committerAndreas Schneider <asn@cryptomilk.org>2016-01-14 08:04:49 +0100
commit6e7eae968a3e20050a3b1d9ebab68c96660babe4 (patch)
tree18b35937a9eab62da2c311848b1efcc31f075ac3 /tests/torture.c
parent5bb9b570f4156579b990758f79e262cc2dd9b2d5 (diff)
downloadlibssh-6e7eae968a3e20050a3b1d9ebab68c96660babe4.tar.gz
libssh-6e7eae968a3e20050a3b1d9ebab68c96660babe4.tar.xz
libssh-6e7eae968a3e20050a3b1d9ebab68c96660babe4.zip
tests: Support other openssh versions ...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'tests/torture.c')
-rw-r--r--tests/torture.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/torture.c b/tests/torture.c
index dc40348a..9cd311d1 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -904,9 +904,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"