From owner-svn-src-all@FreeBSD.ORG Fri Oct 7 12:58:34 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 076F1106566B;
Fri, 7 Oct 2011 12:58:34 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id D1E4A8FC13;
Fri, 7 Oct 2011 12:58:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97CwXLq011665;
Fri, 7 Oct 2011 12:58:33 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97CwXwH011662;
Fri, 7 Oct 2011 12:58:33 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201110071258.p97CwXwH011662@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Fri, 7 Oct 2011 12:58:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r226101 - head/lib/libpam/modules/pam_ssh
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Oct 2011 12:58:34 -0000
Author: des
Date: Fri Oct 7 12:58:33 2011
New Revision: 226101
URL: http://svn.freebsd.org/changeset/base/226101
Log:
Load the ECDSA key if there is one.
MFC after: 1 week
Modified:
head/lib/libpam/modules/pam_ssh/pam_ssh.8
head/lib/libpam/modules/pam_ssh/pam_ssh.c
Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.8
==============================================================================
--- head/lib/libpam/modules/pam_ssh/pam_ssh.8 Fri Oct 7 12:42:03 2011 (r226100)
+++ head/lib/libpam/modules/pam_ssh/pam_ssh.8 Fri Oct 7 12:58:33 2011 (r226101)
@@ -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 ,
Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- head/lib/libpam/modules/pam_ssh/pam_ssh.c Fri Oct 7 12:42:03 2011 (r226100)
+++ head/lib/libpam/modules/pam_ssh/pam_ssh.c Fri Oct 7 12:58:33 2011 (r226101)
@@ -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 *
/* 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;
}