Date: Mon, 20 Aug 2012 17:46:22 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r239453 - stable/9/lib/libpam/modules/pam_ssh Message-ID: <201208201746.q7KHkM9f070227@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208201746.q7KHkM9f070227>