Module Name: src
Committed By: drochner
Date: Fri Dec 16 17:37:14 UTC 2011
Modified Files:
src/lib/libpam/modules/pam_ssh: pam_ssh.8 pam_ssh.c
Log Message:
support ECDSA keys used by recent ssh
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libpam/modules/pam_ssh/pam_ssh.8
cvs rdiff -u -r1.19 -r1.20 src/lib/libpam/modules/pam_ssh/pam_ssh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_ssh/pam_ssh.8
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.8:1.5 src/lib/libpam/modules/pam_ssh/pam_ssh.8:1.6
--- src/lib/libpam/modules/pam_ssh/pam_ssh.8:1.5 Mon Feb 28 10:31:41 2005
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.8 Fri Dec 16 17:37:14 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_ssh.8,v 1.5 2005/02/28 10:31:41 wiz Exp $
+.\" $NetBSD: pam_ssh.8,v 1.6 2011/12/16 17:37:14 drochner Exp $
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.8,v 1.13 2004/07/02 23:52:18 ru Exp $
.\"
-.Dd February 27, 2005
+.Dd December 16, 2011
.Dt PAM_SSH 8
.Os
.Sh NAME
@@ -93,6 +93,10 @@ This option is similar to the
option,
except that if the previously obtained password fails,
the user is prompted for another password.
+.It Cm nullok
+Normally, keys with no passphrase are ignored for authentication purposes.
+If this option is set, keys with no passphrase will be taken into
+consideration, allowing the user to log in with a blank password.
.El
.Ss SSH Session Management Module
The
@@ -130,6 +134,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 ,
Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.19 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.20
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.19 Fri Dec 16 17:35:09 2011
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Fri Dec 16 17:37:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.19 2011/12/16 17:35:09 drochner Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.20 2011/12/16 17:37:14 drochner Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_ssh.c,v 1.19 2011/12/16 17:35:09 drochner Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.20 2011/12/16 17:37:14 drochner Exp $");
#endif
#include <sys/param.h>
@@ -84,6 +84,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
};
