summary refs log tree commit diff
path: root/nixos/modules/services/networking/ssh
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-10-14 14:42:34 +0800
committerPeter Hoeg <peter@hoeg.com>2017-10-14 14:42:49 +0800
commit07bc859e9acec3cc6f7a8129e4b05a7584fef209 (patch)
tree7733b323ebe9a62c1d0744e7fc29cbbe616bcc1f /nixos/modules/services/networking/ssh
parentbdbba026f3f98e26509c21823a00de99af78b9c1 (diff)
downloadnixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.tar
nixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.tar.gz
nixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.tar.bz2
nixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.tar.lz
nixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.tar.xz
nixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.tar.zst
nixlib-07bc859e9acec3cc6f7a8129e4b05a7584fef209.zip
Revert "ssh: deprecate use of old DSA keys"
This reverts commit 65b73d71cbe5df15ce62024123eedea284d825db.
Diffstat (limited to 'nixos/modules/services/networking/ssh')
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 0834fc672842..8828429a8178 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -363,9 +363,12 @@ in
           HostKey ${k.path}
         '')}
 
+        # Allow DSA client keys for now. (These were deprecated
+        # in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
+        # Re-enable DSA host keys for now.
         ${optionalString supportOldHostKeys ''
-          # Allow DSA keys for now. (deprecated in OpenSSH 7.0)
-          PubkeyAcceptedKeyTypes +ssh-dss
           HostKeyAlgorithms +ssh-dss
         ''}
       '';