diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:23:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:50:05 +1000 |
commit | 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd (patch) | |
tree | f13f1c949ae60c16160acebbfb680c3dc7b13fe5 /kexgexc.c | |
parent | 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6 (diff) |
upstream commit
protocol handlers all get struct ssh passed; ok djm@
Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d
Diffstat (limited to 'kexgexc.c')
-rw-r--r-- | kexgexc.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexc.c,v 1.24 2017/05/16 16:56:15 djm Exp $ */ | 1 | /* $OpenBSD: kexgexc.c,v 1.25 2017/05/30 14:23:52 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -51,8 +51,8 @@ | |||
51 | #include "sshbuf.h" | 51 | #include "sshbuf.h" |
52 | #include "misc.h" | 52 | #include "misc.h" |
53 | 53 | ||
54 | static int input_kex_dh_gex_group(int, u_int32_t, void *); | 54 | static int input_kex_dh_gex_group(int, u_int32_t, struct ssh *); |
55 | static int input_kex_dh_gex_reply(int, u_int32_t, void *); | 55 | static int input_kex_dh_gex_reply(int, u_int32_t, struct ssh *); |
56 | 56 | ||
57 | int | 57 | int |
58 | kexgex_client(struct ssh *ssh) | 58 | kexgex_client(struct ssh *ssh) |
@@ -89,9 +89,8 @@ kexgex_client(struct ssh *ssh) | |||
89 | } | 89 | } |
90 | 90 | ||
91 | static int | 91 | static int |
92 | input_kex_dh_gex_group(int type, u_int32_t seq, void *ctxt) | 92 | input_kex_dh_gex_group(int type, u_int32_t seq, struct ssh *ssh) |
93 | { | 93 | { |
94 | struct ssh *ssh = ctxt; | ||
95 | struct kex *kex = ssh->kex; | 94 | struct kex *kex = ssh->kex; |
96 | BIGNUM *p = NULL, *g = NULL; | 95 | BIGNUM *p = NULL, *g = NULL; |
97 | int r, bits; | 96 | int r, bits; |
@@ -143,9 +142,8 @@ out: | |||
143 | } | 142 | } |
144 | 143 | ||
145 | static int | 144 | static int |
146 | input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt) | 145 | input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh) |
147 | { | 146 | { |
148 | struct ssh *ssh = ctxt; | ||
149 | struct kex *kex = ssh->kex; | 147 | struct kex *kex = ssh->kex; |
150 | BIGNUM *dh_server_pub = NULL, *shared_secret = NULL; | 148 | BIGNUM *dh_server_pub = NULL, *shared_secret = NULL; |
151 | struct sshkey *server_host_key = NULL; | 149 | struct sshkey *server_host_key = NULL; |