d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: 304626,304635:

Browse Source 
r304626: Add support for Ed25519 keys.
        r304635: Remove support for SSH1, already disabled in our OpenSSH.

Submitted by:	mwlucas (r304626), vangyzen (r304635)
This commit is contained in:
Ollivier Robert 2016-09-25 09:36:52 +00:00
parent 9463bb9bf4
commit b623910ccf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libpam/modules/pam_ssh/pam_ssh.8
View File

@ -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 ,

2
lib/libpam/modules/pam_ssh/pam_ssh.c
View File

@ -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
};