svn commit: r255423 - stable/8/lib/libpam/modules/pam_ssh

[John Baldwin]

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);