summary refs log tree commit diff
path: root/pkgs/tools/networking/openssh
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-01 16:27:46 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-01 16:31:43 +0100
commita7b7ac8bfb948f05c8956f8de23d806fb7686438 (patch)
tree2d9b2b18a5eec1d41e3a2a5559c3c5c48d64e0cd /pkgs/tools/networking/openssh
parenta7f09e97734792b7d3d68b13825ced07f737a006 (diff)
downloadnixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.tar
nixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.tar.gz
nixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.tar.bz2
nixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.tar.lz
nixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.tar.xz
nixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.tar.zst
nixlib-a7b7ac8bfb948f05c8956f8de23d806fb7686438.zip
openssh: Enable DSA host/client keys
This applies a patch from Fedora to make HostKeyAlgorithms do the
right thing, fixing the issue described in
401782cb678d2e28c0f7f2d40c6421624f410148.
Diffstat (limited to 'pkgs/tools/networking/openssh')
-rw-r--r--pkgs/tools/networking/openssh/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index bb27b0cc3fcb..73e92aa4b8e5 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -36,7 +36,16 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ]
+  patches =
+    [ ./locale_archive.patch
+
+      # Fix "HostKeyAlgoritms +...", which we need to enable DSA
+      # host key support.
+      (fetchurl {
+        url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f";
+        sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp";
+      })
+    ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]