diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-20 13:50:04 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-20 14:08:18 +0200 |
| commit | 401782cb678d2e28c0f7f2d40c6421624f410148 (patch) | |
| tree | be49a9309ed5f0925986aac7c9bbed526a8054fe /nixos/modules/programs | |
| parent | e4c2f97a2764d5dcf763dce8c7f766737d0dffe0 (diff) | |
| download | nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.tar nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.tar.gz nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.tar.bz2 nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.tar.lz nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.tar.xz nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.tar.zst nixlib-401782cb678d2e28c0f7f2d40c6421624f410148.zip | |
Revert "openssh: 6.9p1 -> 7.0p1"
This reverts commit a8eb2a6a81524f3be0c8886f6d06090b50b0a513. OpenSSH 7.0 is causing too many interoperability problems so soon before the 15.08 release. For instance, it causes NixOps EC2 initial deployments to fail with "REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client knows the server's ssh-dss host key, but this key is no longer accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does not work because it causes ssh-dss to be ordered after "ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh prioritizes host key algorithms for which the client has a known host key, but not if you set HostKeyAlgorithms.)
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 9c94250cb1f0..d3183f7d2dc7 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -115,9 +115,6 @@ in ForwardX11 ${if cfg.forwardX11 then "yes" else "no"} - # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss - ${cfg.extraConfig} ''; |