diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2013-07-19 07:37:49 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2013-07-19 07:37:49 +0000 |
| commit | 03d2fde6ad89a51fef89d02617e8c711833a5abe (patch) | |
| tree | 534233e68b0bcd212ab790e7c7f3f1eef7d63f46 /usr.bin/ssh/kexgexs.c | |
| parent | 0d38b94a2cd827c21ab8cb80bc122b39b2188f0b (diff) | |
add ssh-agent(1) support to sshd(8); allows encrypted hostkeys,
or hostkeys on smartcards; most of the work by Zev Weiss; bz #1974
ok djm@
Diffstat (limited to 'usr.bin/ssh/kexgexs.c')
| -rw-r--r-- | usr.bin/ssh/kexgexs.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/usr.bin/ssh/kexgexs.c b/usr.bin/ssh/kexgexs.c index cabe3b5c813..1df2243c398 100644 --- a/usr.bin/ssh/kexgexs.c +++ b/usr.bin/ssh/kexgexs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexs.c,v 1.15 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: kexgexs.c,v 1.16 2013/07/19 07:37:48 markus Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -65,10 +65,6 @@ kexgex_server(Kex *kex) if (server_host_public == NULL) fatal("Unsupported hostkey type %d", kex->hostkey_type); server_host_private = kex->load_host_private_key(kex->hostkey_type); - if (server_host_private == NULL) - fatal("Missing private key for hostkey type %d", - kex->hostkey_type); - type = packet_read(); switch (type) { @@ -184,9 +180,8 @@ kexgex_server(Kex *kex) } /* sign H */ - if (PRIVSEP(key_sign(server_host_private, &signature, &slen, hash, - hashlen)) < 0) - fatal("kexgex_server: key_sign failed"); + kex->sign(server_host_private, server_host_public, &signature, &slen, + hash, hashlen); /* destroy_sensitive_data(); */ |