 @@ -1,14 +1,14 @@
-/*	$NetBSD: pam_ssh.c,v 1.17 2011/05/06 17:22:09 drochner Exp $	*/
+/*	$NetBSD: pam_ssh.c,v 1.18 2011/12/16 17:30:12 drochner Exp $	*/
 /*-
  * Copyright (c) 2003 Networks Associates Technology, Inc.
  * All rights reserved.
+ *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
  * NAI Labs, the Security Research Division of Network Associates, Inc.
  * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
  * DARPA CHATS research program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -28,27 +28,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #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.17 2011/05/06 17:22:09 drochner Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.18 2011/12/16 17:30:12 drochner Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 @@ -57,62 +57,64 @@ __RCSID("$NetBSD: pam_ssh.c,v 1.17 2011/
 #define PAM_SM_SESSION
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 #include <security/openpam.h>
 #include <openssl/evp.h>
 #include "key.h"
 #include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
 #define ssh_add_identity(auth, key, comment) \
 	ssh_add_identity_constrained(auth, key, comment, 0, 0)
 extern char **environ;
 struct pam_ssh_key {
 	Key	*key;
 	char	*comment;
 };
 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 */
 	NULL
 };
 static const char *pam_ssh_agent = "/usr/bin/ssh-agent";
-static const char *pam_ssh_agent_argv[] = { "ssh_agent", "-s", NULL };
+static const char *const pam_ssh_agent_argv[] = { "ssh_agent", "-s", NULL };
-static const char *pam_ssh_agent_envp[] = { NULL };
+static const char *const pam_ssh_agent_envp[] = { NULL };
 /*
  * Attempts to load a private key from the specified file in the specified
  * directory, using the specified passphrase.  If successful, returns a
  * struct pam_ssh_key containing the key and its comment.
  */
 static struct pam_ssh_key *
-pam_ssh_load_key(struct passwd *pwd, const char *kfn, const char *passphrase)
+pam_ssh_load_key(const char *dir, const char *kfn, const char *passphrase)
+{
 	struct pam_ssh_key *psk;
 	char fn[PATH_MAX];
 	char *comment;
 	Key *key;
-	if (snprintf(fn, sizeof(fn), "%s/%s", pwd->pw_dir, kfn) >
+	if (snprintf(fn, sizeof(fn), "%s/%s", dir, kfn) > (int)sizeof(fn))
 	    (int)sizeof(fn))
 		return (NULL);
 	comment = NULL;
 	key = key_load_private(fn, passphrase, &comment);
 	if (key == NULL) {
 		openpam_log(PAM_LOG_DEBUG, "failed to load key from %s", fn);
 		if (comment != NULL)
 			free(comment);
 		return (NULL);
+	}
 	openpam_log(PAM_LOG_DEBUG, "loaded '%s' from %s", comment, fn);
 	if ((psk = malloc(sizeof(*psk))) == NULL) {
 		key_free(key);
 @@ -134,78 +136,65 @@ pam_ssh_free_key(pam_handle_t *pamh __un
 	struct pam_ssh_key *psk;
 	psk = data;
 	key_free(psk->key);
 	free(psk->comment);
 	free(psk);
+}
 PAM_EXTERN int
 pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
     int argc __unused, const char *argv[] __unused)
+{
 	const char **kfn, *passphrase, *user;
 	const void *item;
 	struct passwd *pwd, pwres;
 	struct pam_ssh_key *psk;
 	int nkeys, pam_err, pass;
 	char pwbuf[1024];
 	/* PEM is not loaded by default */
 	OpenSSL_add_all_algorithms();
 	/* get user name and home directory */
 	pam_err = pam_get_user(pamh, &user, NULL);
 	if (pam_err != PAM_SUCCESS)
 		return (pam_err);
 	if (getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
 	    pwd == NULL)
 		return (PAM_USER_UNKNOWN);
 	if (pwd->pw_dir == NULL)
 		return (PAM_AUTH_ERR);
 	/* switch to user credentials */
 	pam_err = openpam_borrow_cred(pamh, pwd);
 	if (pam_err != PAM_SUCCESS)
 		return (pam_err);
-#ifdef notyet
+	pass = (pam_get_item(pamh, PAM_AUTHTOK, &item) == PAM_SUCCESS &&
-	for (kfn = pam_ssh_keyfiles; *kfn != NULL; ++kfn) {
+	    item != NULL);
 		char path[MAXPATHLEN];
 		(void)snprintf(path, sizeof(path), "%s/%s", pwd->pw_dir, *kfn);
 		if (access(path, R_OK) == 0)
 			break;
 	if (*kfn == NULL) {
 		openpam_restore_cred(pamh);
 		return (PAM_AUTH_ERR);
 #endif
 	pass = (pam_get_item(pamh, PAM_AUTHTOK,
 	    (const void **)__UNCONST(&passphrase)) == PAM_SUCCESS);
  load_keys:
 	/* get passphrase */
 	pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
 	    &passphrase, pam_ssh_prompt);
 	if (pam_err != PAM_SUCCESS) {
 		openpam_restore_cred(pamh);
 		return (pam_err);
+	}
 	/* try to load keys from all keyfiles we know of */
 	nkeys = 0;
 	for (kfn = pam_ssh_keyfiles; *kfn != NULL; ++kfn) {
-		psk = pam_ssh_load_key(pwd, *kfn, passphrase);
+		psk = pam_ssh_load_key(pwd->pw_dir, *kfn, passphrase);
 		if (psk != NULL) {
 			pam_set_data(pamh, *kfn, psk, pam_ssh_free_key);
 			++nkeys;
+		}
+	}
 	/*
 	 * If we tried an old token and didn't get anything, and
 	 * try_first_pass was specified, try again after prompting the
 	 * user for a new passphrase.
 	 */
 	if (nkeys == 0 && pass == 1 &&
 	    openpam_get_option(pamh, "try_first_pass") != NULL) {
 @@ -366,27 +355,27 @@ pam_ssh_add_keys_to_agent(pam_handle_t *
 		openpam_log(PAM_LOG_DEBUG,
 		    "%s: cannot get authentication connection",
 		    __func__);
 		pam_err = PAM_SYSTEM_ERR;
 		goto end;
+	}
 	/* look for keys to add to it */
 	for (kfn = pam_ssh_keyfiles; *kfn != NULL; ++kfn) {
 		const void *vp;
 		pam_err = pam_get_data(pamh, *kfn, &vp);
 		psk = vp;
 		if (pam_err == PAM_SUCCESS && psk != NULL) {
-			if (ssh_add_identity_constrained(ac, psk->key, psk->comment, 0, 0))
+			if (ssh_add_identity(ac, psk->key, psk->comment))
 				openpam_log(PAM_LOG_DEBUG,
 				    "added %s to ssh agent", psk->comment);
 			else
 				openpam_log(PAM_LOG_DEBUG, "failed "
 				    "to add %s to ssh agent", psk->comment);
 			/* we won't need the key again, so wipe it */
 			pam_set_data(pamh, *kfn, NULL, NULL);
+		}
+	}
 	pam_err = PAM_SUCCESS;
  end:
 	/* disconnect from agent */
 	if (ac != NULL)