HBSD MFCL pam_ssh - Add support for Ed25519 keys.

Reported by: mwlucas MFH: 2 weeks (cherry picked from commit d845428) Signed-off-by: Oliver Pinter <oliver.pinter@hardenedbsd.org>
HardenedBSD · Sep 22, 2016 · e083321 · e083321
1 parent a2beea4
commit e083321
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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
 };