summaryrefslogtreecommitdiffstats
path: root/lib/libpam/modules/pam_ssh
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2012-05-26 17:03:45 +0000
committerdes <des@FreeBSD.org>2012-05-26 17:03:45 +0000
commit14a6c41ca7a3722b33e2208c83fb8b4a009b0ecf (patch)
treea64dcdb82b6e12acfadc19359a8ed726b70b6aaf /lib/libpam/modules/pam_ssh
parent00acb776a5294c827116b4c89b7f2bcbb17575b7 (diff)
downloadFreeBSD-src-14a6c41ca7a3722b33e2208c83fb8b4a009b0ecf.zip
FreeBSD-src-14a6c41ca7a3722b33e2208c83fb8b4a009b0ecf.tar.gz
Passing NULL as a key casues a segfault when loading SSH 1 keys. Use
an empty string instead.
Diffstat (limited to 'lib/libpam/modules/pam_ssh')
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index ab4990b..405dd6b 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -112,7 +112,7 @@ pam_ssh_load_key(const char *dir, const char *kfn, const char *passphrase,
* 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);
OpenPOWER on IntegriCloud