aboutsummaryrefslogtreecommitdiff
path: root/lib/libpam
diff options
context:
space:
mode:
authorOllivier Robert <roberto@FreeBSD.org>2016-08-22 19:27:20 +0000
committerOllivier Robert <roberto@FreeBSD.org>2016-08-22 19:27:20 +0000
commit6533da453abd516677c2c60ee7ff5f265dfcf56e (patch)
tree311e966f76de0b372e2b3b6dbfa22cec25855bb6 /lib/libpam
parent724c3e47f6f0374a656aa1af55ab40b9a2957ed6 (diff)
downloadsrc-6533da453abd516677c2c60ee7ff5f265dfcf56e.tar.gz
src-6533da453abd516677c2c60ee7ff5f265dfcf56e.zip
Add support for Ed25519 keys.
Reported by: mwlucas MFH: 2 weeks
Notes
Notes: svn path=/head/; revision=304626
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.82
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8
index 7c1ee40bf1ea..de0a9515aacf 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.8
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.8
@@ -137,6 +137,8 @@ SSH2 RSA key
SSH2 DSA key
.It Pa $HOME/.ssh/id_ecdsa
SSH2 ECDSA key
+.It Pa $HOME/.ssh/id_ed25519
+SSH2 Ed25519 key
.El
.Sh SEE ALSO
.Xr ssh-agent 1 ,
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index f95c73768baa..95c9bfee617c 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -81,6 +81,7 @@ static const char *pam_ssh_keyfiles[] = {
".ssh/id_rsa", /* SSH2 RSA key */
".ssh/id_dsa", /* SSH2 DSA key */
".ssh/id_ecdsa", /* SSH2 ECDSA key */
+ ".ssh/id_ed25519", /* SSH2 Ed25519 key */
NULL
};