From owner-svn-src-stable@FreeBSD.ORG  Mon Sep  9 15:38:52 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2625693D;
 Mon,  9 Sep 2013 15:38:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 124242EE4;
 Mon,  9 Sep 2013 15:38:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r89Fcpwv022454;
 Mon, 9 Sep 2013 15:38:51 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r89FcpG4022453;
 Mon, 9 Sep 2013 15:38:51 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201309091538.r89FcpG4022453@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 9 Sep 2013 15:38:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r255423 - stable/8/lib/libpam/modules/pam_ssh
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Sep 2013 15:38:52 -0000

Author: jhb
Date: Mon Sep  9 15:38:51 2013
New Revision: 255423
URL: http://svnweb.freebsd.org/changeset/base/255423

Log:
  MFC 236106:
  Passing NULL as a key casues a segfault when loading SSH 1 keys.  Use
  an empty string instead.

Modified:
  stable/8/lib/libpam/modules/pam_ssh/pam_ssh.c
Directory Properties:
  stable/8/lib/libpam/   (props changed)

Modified: stable/8/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- stable/8/lib/libpam/modules/pam_ssh/pam_ssh.c	Mon Sep  9 13:56:58 2013	(r255422)
+++ stable/8/lib/libpam/modules/pam_ssh/pam_ssh.c	Mon Sep  9 15:38:51 2013	(r255423)
@@ -110,7 +110,7 @@ pam_ssh_load_key(const char *dir, const 
 	 * with an empty passphrase, and if the key is not encrypted,
 	 * accept only an empty passphrase.
 	 */
-	key = key_load_private(fn, NULL, &comment);
+	key = key_load_private(fn, "", &comment);
 	if (key != NULL && !(*passphrase == '\0' && nullok)) {
 		key_free(key);
 		return (NULL);