svn commit: r239454 - releng/9.1/lib/libpam/modules/pam_ssh

[Dag-Erling Smørgrav]

Author: des
Date: Mon Aug 20 17:50:20 2012
New Revision: 239454
URL: http://svn.freebsd.org/changeset/base/239454

Log:
  MFH r236106: avoid segfault with SSH 1 keys
  
  Approved by:	re (kib)

Modified:
  releng/9.1/lib/libpam/modules/pam_ssh/pam_ssh.c
Directory Properties:
  releng/9.1/lib/libpam/   (props changed)

Modified: releng/9.1/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- releng/9.1/lib/libpam/modules/pam_ssh/pam_ssh.c	Mon Aug 20 17:46:22 2012	(r239453)
+++ releng/9.1/lib/libpam/modules/pam_ssh/pam_ssh.c	Mon Aug 20 17:50:20 2012	(r239454)
@@ -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);