diff options
| author | des <des@FreeBSD.org> | 2011-10-07 12:58:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-10-07 12:58:33 +0000 |
| commit | c5fa84a4783cf66dc551a47a6d2fce6d17b825a3 (patch) | |
| tree | a9630ba521f051b5dd3b5419257de6933bbe129c /lib | |
| parent | e229f3cc32b2ef700cda399cee0a4076c942f68f (diff) | |
| download | FreeBSD-src-c5fa84a4783cf66dc551a47a6d2fce6d17b825a3.zip FreeBSD-src-c5fa84a4783cf66dc551a47a6d2fce6d17b825a3.tar.gz | |
Load the ECDSA key if there is one.
MFC after: 1 week
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.8 | 6 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8 index 07e3176..ea41455 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.8 +++ b/lib/libpam/modules/pam_ssh/pam_ssh.8 @@ -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 , diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index bec9892..bc5f522 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -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; } |
