diff options
author | Damien Miller <djm@mindrot.org> | 2003-02-24 12:03:03 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-02-24 12:03:03 +1100 |
commit | 8e7fb335235bd6a7f8387a40bf71eaf9798f6f7e (patch) | |
tree | 46ba3e898aebfc99e531d793bccac6c0eba5e87d /ssh-keyscan.c | |
parent | 1587fb8a174f57a064d603bbd595c3369aa697aa (diff) |
- markus@cvs.openbsd.org 2003/02/16 17:09:57
[kex.c kexdh.c kexgex.c kex.h sshconnect2.c sshd.c ssh-keyscan.c]
split kex into client and server code, no need to link
server code into the client; ok provos@
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r-- | ssh-keyscan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 8c14d6d26..5b4eb82d1 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.40 2002/07/06 17:47:58 stevesk Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.41 2003/02/16 17:09:57 markus Exp $"); |
11 | 11 | ||
12 | #include "openbsd-compat/sys-queue.h" | 12 | #include "openbsd-compat/sys-queue.h" |
13 | 13 | ||
@@ -354,6 +354,8 @@ keygrab_ssh2(con *c) | |||
354 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? | 354 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? |
355 | "ssh-dss": "ssh-rsa"; | 355 | "ssh-dss": "ssh-rsa"; |
356 | c->c_kex = kex_setup(myproposal); | 356 | c->c_kex = kex_setup(myproposal); |
357 | c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | ||
358 | c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | ||
357 | c->c_kex->verify_host_key = hostjump; | 359 | c->c_kex->verify_host_key = hostjump; |
358 | 360 | ||
359 | if (!(j = setjmp(kexjmp))) { | 361 | if (!(j = setjmp(kexjmp))) { |