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

Log:
  MFH r236106: avoid segfault with SSH 1 keys

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

Modified: stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c       Mon Aug 20 17:36:10 
2012        (r239452)
+++ stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c       Mon Aug 20 17:46:22 
2012        (r239453)
@@ -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);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to