diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
| commit | 32750e8c3ed38df4cafb39cffa878c6851abc899 (patch) | |
| tree | dcf40b321c3b492bd1d00244c78f72160e66a554 /gnu/packages/ssh.scm | |
| parent | 6104071e483095f9fea9700e0317e84f64102ae2 (diff) | |
| parent | e1e32303129c5aedc7236d5cc854d6b72ad35daf (diff) | |
| download | guix-32750e8c3ed38df4cafb39cffa878c6851abc899.tar guix-32750e8c3ed38df4cafb39cffa878c6851abc899.tar.gz | |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 5181e9e378..842f3a456b 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> @@ -200,11 +200,11 @@ a server that supports the SSH-2 protocol.") (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) (inputs `(("libedit" ,libedit) - ("libfido2" ,libfido2) ("openssl" ,openssl) ,@(if (hurd-target?) - '() - `(("pam" ,linux-pam))) + '() + `(("pam" ,linux-pam) + ("libfido2" ,libfido2))) ;fails to build on GNU/Hurd ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' @@ -229,10 +229,13 @@ a server that supports the SSH-2 protocol.") ;; Enable PAM support in sshd. ,,@(if (hurd-target?) '() - '("--with-pam")) + '("--with-pam" + + ;; Support creation and use of ecdsa-sk, + ;; ed25519-sk keys. + "--with-security-key-builtin")) + - ;; supports creation and use of ecdsa-sk, ed25519-sk keys - "--with-security-key-builtin" ;; "make install" runs "install -s" by default, ;; which doesn't work for cross-compiled binaries |