summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-20 19:06:15 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-17 19:55:07 +0000
commit87c86f9fe8a7ce7f0bdeb33f6f782531265ee5b7 (patch)
tree2e39997edae44faeb0e378d6009d9f49d9e20a91
parentEnabling ED25519 user keys explicitly in /etc/ssh/ssh_config. (diff)
downloadopenssh-87c86f9fe8a7ce7f0bdeb33f6f782531265ee5b7.zip
openssh-87c86f9fe8a7ce7f0bdeb33f6f782531265ee5b7.tar.xz
Updating ssh-config-pubkeyacceptedkeytypes.patch to include ED25519.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/progress-linux/0009-ssh-config-pubkeyacceptedkeytypes.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/progress-linux/0009-ssh-config-pubkeyacceptedkeytypes.patch b/debian/patches/progress-linux/0009-ssh-config-pubkeyacceptedkeytypes.patch
index 0c3d59c..31548db 100644
--- a/debian/patches/progress-linux/0009-ssh-config-pubkeyacceptedkeytypes.patch
+++ b/debian/patches/progress-linux/0009-ssh-config-pubkeyacceptedkeytypes.patch
@@ -4,11 +4,11 @@ Description: Setting PubkeyAcceptedKeyTypes to ssh-rsa-cert-v01@openssh.com,ssh-
diff -Naurp openssh.orig/ssh_config openssh/ssh_config
--- openssh.orig/ssh_config
+++ openssh/ssh_config
-@@ -33,6 +33,7 @@ Host *
- # ConnectTimeout 0
+@@ -34,6 +34,7 @@ Host *
# StrictHostKeyChecking ask
IdentityFile ~/.ssh/id_rsa
-+ PubkeyAcceptedKeyTypes ssh-rsa-cert-v01@openssh.com,ssh-rsa
+ IdentityFile ~/.ssh/id_ed25519
++ PubkeyAcceptedKeyTypes ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa
# Port 22
# Protocol 2
# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc