diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/Makefile.in | 4 | ||||
| -rw-r--r-- | testing/hosts/default/etc/ssh/sshd_config | 1 | ||||
| -rw-r--r-- | testing/ssh_config | 2 | ||||
| -rw-r--r-- | testing/testing.conf | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/testing/Makefile.in b/testing/Makefile.in index 22de00b50..1087ab917 100644 --- a/testing/Makefile.in +++ b/testing/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/testing/hosts/default/etc/ssh/sshd_config b/testing/hosts/default/etc/ssh/sshd_config index ecd7f4fd1..46b1f0231 100644 --- a/testing/hosts/default/etc/ssh/sshd_config +++ b/testing/hosts/default/etc/ssh/sshd_config @@ -1,6 +1,5 @@ Port 22 Protocol 2 -Ciphers arcfour HostKey /etc/ssh/ssh_host_rsa_key HostKey /etc/ssh/ssh_host_dsa_key HostKey /etc/ssh/ssh_host_ecdsa_key diff --git a/testing/ssh_config b/testing/ssh_config index 56a619002..3ecdd27d1 100644 --- a/testing/ssh_config +++ b/testing/ssh_config @@ -6,8 +6,6 @@ Host * StrictHostKeyChecking no UserKnownHostsFile /dev/null GSSAPIAuthentication yes - # faster encryption - Ciphers arcfour # share multiple sessions ControlMaster auto ControlPath /tmp/ssh-uml-%r@%h:%p diff --git a/testing/testing.conf b/testing/testing.conf index 78c8dcabc..92b9693c1 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -24,11 +24,15 @@ fi : ${TESTDIR=/srv/strongswan-testing} # Kernel configuration +<<<<<<< Updated upstream : ${KERNELVERSION=4.18.9} +======= +: ${KERNELVERSION=4.15.9} +>>>>>>> Stashed changes : ${KERNEL=linux-$KERNELVERSION} : ${KERNELTARBALL=$KERNEL.tar.xz} -: ${KERNELCONFIG=$DIR/../config/kernel/config-4.18} -: ${KERNELPATCH=ha-4.16-abicompat.patch.bz2} +: ${KERNELCONFIG=$DIR/../config/kernel/config-4.15} +: ${KERNELPATCH=ha-4.15.6-abicompat.patch.bz2} # strongSwan version used in tests : ${SWANVERSION=5.7.0} |