openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-16 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

use sshkey_load_private in ssh-proxy

Browse Source
This commit is contained in:
Markus Friedl
2012-02-16 12:48:21 +01:00
parent 68cf42d1fe
commit 54fc03566d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssh/ssh-proxy.c
View File

@@ -416,7 +416,7 @@ usage(void)
int
main(int argc, char **argv)
{
int ch, log_stderr = 1, fd;
int ch, log_stderr = 1, fd, r;
struct event ev;
char *hostkey_file = NULL, *known_hostkey_file = NULL;
SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;
@@ -461,11 +461,13 @@ main(int argc, char **argv)
}
log_init(__progname, log_level, log_facility, log_stderr);
if (hostkey_file &&
(hostkey = key_load_private(hostkey_file, "", NULL)) == NULL)
fatal("key_load_private: %s", hostkey_file);
(r = sshkey_load_private(hostkey_file, "", &hostkey, NULL)) != 0)
fatal("sshkey_load_private: %s: %s", hostkey_file, ssh_err(r));
if (known_hostkey_file &&
(known_hostkey = key_load_public(known_hostkey_file, NULL)) == NULL)
fatal("key_load_public: %s", known_hostkey_file);
(r = sshkey_load_public(known_hostkey_file, &known_hostkey,
NULL)) != 0)
fatal("sshkey_load_public: %s: %s", known_hostkey_file,
ssh_err(r));
if (!foreground)
daemon(0, 0);
event_init();