summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-30 20:36:15 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-17 19:55:08 +0000
commit5b1b29f1f8786db5cb133720e7e679cce3590d1c (patch)
tree292353670def8f52b774b5b5dcb8457249e01aac
parentUpdating sshd-config-pubkeyacceptedkeytypes.patch to include ED25519. (diff)
downloadopenssh-5b1b29f1f8786db5cb133720e7e679cce3590d1c.zip
openssh-5b1b29f1f8786db5cb133720e7e679cce3590d1c.tar.xz
Refreshing sshd-config-authorizedkeysfile.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/progress-linux/0026-sshd-config-authorizedkeysfile.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/progress-linux/0026-sshd-config-authorizedkeysfile.patch b/debian/patches/progress-linux/0026-sshd-config-authorizedkeysfile.patch
index 4438ee6..b1e1159 100644
--- a/debian/patches/progress-linux/0026-sshd-config-authorizedkeysfile.patch
+++ b/debian/patches/progress-linux/0026-sshd-config-authorizedkeysfile.patch
@@ -4,9 +4,9 @@ Description: Setting AuthorizedKeysFile to /etc/ssh/authorized_keys/%u and .ssh/
diff -Naurp openssh.orig/sshd_config openssh/sshd_config
--- openssh.orig/sshd_config
+++ openssh/sshd_config
-@@ -38,9 +38,7 @@ PermitRootLogin no
+@@ -40,9 +40,7 @@ PermitRootLogin no
#PubkeyAuthentication yes
- PubkeyAcceptedKeyTypes ssh-rsa-cert-v01@openssh.com,ssh-rsa
+ PubkeyAcceptedKeyTypes ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa
-# Expect .ssh/authorized_keys2 to be disregarded by default in future.
-#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2