summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-20 19:10:48 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-17 19:55:07 +0000
commit6e043e34898cc0fb3c23ac55b7563f0811e4848c (patch)
tree06660860ce9a16d72b10887bed8be9daa8fe8728
parentUpdating ssh-config-kexalgorithms.patch to include ED25519. (diff)
downloadopenssh-6e043e34898cc0fb3c23ac55b7563f0811e4848c.zip
openssh-6e043e34898cc0fb3c23ac55b7563f0811e4848c.tar.xz
Refreshing ssh-config-macs.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/progress-linux/0013-ssh-config-macs.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/progress-linux/0013-ssh-config-macs.patch b/debian/patches/progress-linux/0013-ssh-config-macs.patch
index b6e9482..2dbf56b 100644
--- a/debian/patches/progress-linux/0013-ssh-config-macs.patch
+++ b/debian/patches/progress-linux/0013-ssh-config-macs.patch
@@ -4,10 +4,10 @@ Description: Setting MACs to hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@ope
diff -Naurp openssh.orig/ssh_config openssh/ssh_config
--- openssh.orig/ssh_config
+++ openssh/ssh_config
-@@ -39,7 +39,7 @@ Host *
- HostKeyAlgorithms ssh-rsa-cert-v01@openssh.com,ssh-rsa
+@@ -40,7 +40,7 @@ Host *
+ HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa
Ciphers aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes128-ctr
- KexAlgorithms diffie-hellman-group-exchange-sha256
+ KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
-# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
+ MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512,hmac-sha2-256
# EscapeChar ~