summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-05-27 00:04:13 +0200
committeranonym <anonym@riseup.net>2016-05-27 00:04:13 +0200
commit102217c36408f3ab301e8e37337f323f63eb8efd (patch)
tree4de5b12930624e546ec79cec745e412994a84de1 /config
parentbe99eed091bbe6d56489f6d542a53981d8abbd36 (diff)
parente819d4ffe63c9aff33d6bdd98e67436d37f91ec3 (diff)
Merge remote-tracking branch 'origin/feature/7315-drop-custom-ssh-crypto-settings' into testing
Fix-committed: #7315
Diffstat (limited to 'config')
-rw-r--r--config/chroot_local-includes/etc/ssh/ssh_config3
1 files changed, 0 insertions, 3 deletions
diff --git a/config/chroot_local-includes/etc/ssh/ssh_config b/config/chroot_local-includes/etc/ssh/ssh_config
index a999ec8..e71fa6a 100644
--- a/config/chroot_local-includes/etc/ssh/ssh_config
+++ b/config/chroot_local-includes/etc/ssh/ssh_config
@@ -5,9 +5,6 @@ Host *
ProxyCommand /usr/local/lib/connect-socks %h %p
-Ciphers aes256-ctr,aes256-cbc,aes128-ctr,aes128-cbc,3des-cbc
-MACs hmac-sha1,hmac-md5,hmac-ripemd160
-
Compression yes
CompressionLevel 9