dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

openssh: Re-enable DSA client keys

Browse Source 
This was broken by a8eb2a6a81.
This commit is contained in:
Eelco Dolstra 2015-08-18 13:09:38 +02:00
parent f044c31174
commit 1f2eef5ae9
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/modules/programs/ssh.nix
View File

@ -103,20 +103,23 @@ in
message = "cannot enable X11 forwarding without setting XAuth location";
};
environment.etc =
[ { # SSH configuration. Slight duplication of the sshd_config
# generation in the sshd service.
source = pkgs.writeText "ssh_config" ''
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
${optionalString cfg.setXAuthLocation ''
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
${cfg.extraConfig}
'';
target = "ssh/ssh_config";
}
];
# SSH configuration. Slight duplication of the sshd_config
# generation in the sshd service.
environment.etc."ssh/ssh_config".text =
''
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
${optionalString cfg.setXAuthLocation ''
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
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}
'';
# FIXME: this should really be socket-activated for über-awesomeness.
systemd.user.services.ssh-agent =

3
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -413,6 +413,9 @@ in
${flip concatMapStrings cfg.hostKeys (k: ''
HostKey ${k.path}
'')}
# Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
PubkeyAcceptedKeyTypes +ssh-dss
'';
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;