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

Load the ECDSA key if there is one.

Browse Source 
MFC after:	1 week
This commit is contained in:
Dag-Erling Smørgrav 2011-10-07 12:58:33 +00:00
parent 073e2d2c93
commit 32627537b8
2 changed files with 7 additions and 2 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

@ -1,6 +1,6 @@
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav
.\" All rights reserved.
.\"
.\" This software was developed for the FreeBSD Project by ThinkSec AS and
@ -34,7 +34,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd November 26, 2001
.Dd October 7, 2011
.Dt PAM_SSH 8
.Os
.Sh NAME
@ -135,6 +135,8 @@ SSH1 RSA key
SSH2 RSA key
.It Pa $HOME/.ssh/id_dsa
SSH2 DSA key
.It Pa $HOME/.ssh/id_ecdsa
SSH2 ECDSA key
.El
.Sh SEE ALSO
.Xr ssh-agent 1 ,

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

@ -1,5 +1,6 @@
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
* All rights reserved.
*
* This software was developed for the FreeBSD Project by ThinkSec AS and
@ -78,6 +79,7 @@ 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 */
NULL
};
@ -324,6 +326,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
/* get a connection to the agent */
if ((ac = ssh_get_authentication_connection()) == NULL) {
openpam_log(PAM_LOG_DEBUG, "failed to connect to the agent");
pam_err = PAM_SYSTEM_ERR;
goto end;
}