diff options
| author | roberto <roberto@FreeBSD.org> | 2016-09-25 09:36:52 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2016-09-25 09:36:52 +0000 |
| commit | 51e4fa4701addeb2198fc3cef73bc9c60ae262d9 (patch) | |
| tree | 46ab4a39275923f416ef75135598be72d1cd4df3 | |
| parent | e2775c9cb2d549e09c7d3cc2f47aaa43d5f2b74c (diff) | |
| download | FreeBSD-src-51e4fa4701addeb2198fc3cef73bc9c60ae262d9.zip FreeBSD-src-51e4fa4701addeb2198fc3cef73bc9c60ae262d9.tar.gz | |
MFC: 304626,304635:
r304626: Add support for Ed25519 keys.
r304635: Remove support for SSH1, already disabled in our OpenSSH.
Submitted by: mwlucas (r304626), vangyzen (r304635)
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.8 | 6 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8 index 7c1ee40..1afcfc7 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.8 +++ b/lib/libpam/modules/pam_ssh/pam_ssh.8 @@ -128,15 +128,15 @@ Start an agent even if no keys were decrypted during the authentication phase. .El .Sh FILES -.Bl -tag -width ".Pa $HOME/.ssh/identity" -compact -.It Pa $HOME/.ssh/identity -SSH1 RSA key +.Bl -tag -width ".Pa $HOME/.ssh/id_ed25519" -compact .It Pa $HOME/.ssh/id_rsa SSH2 RSA key .It Pa $HOME/.ssh/id_dsa 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 f95c737..821228d 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -77,10 +77,10 @@ static const char *pam_ssh_prompt = "SSH passphrase: "; static const char *pam_ssh_have_keys = "pam_ssh_have_keys"; static const char *pam_ssh_keyfiles[] = { - ".ssh/identity", /* SSH1 RSA key */ ".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 }; |
