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 /kexdhs.c | |
parent | 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6 (diff) |
upstream commit
protocol handlers all get struct ssh passed; ok djm@
Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d
Diffstat (limited to 'kexdhs.c')
-rw-r--r-- | kexdhs.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhs.c,v 1.24 2016/05/02 10:26:04 djm Exp $ */ | 1 | /* $OpenBSD: kexdhs.c,v 1.25 2017/05/30 14:23:52 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -49,7 +49,7 @@ | |||
49 | #include "ssherr.h" | 49 | #include "ssherr.h" |
50 | #include "sshbuf.h" | 50 | #include "sshbuf.h" |
51 | 51 | ||
52 | static int input_kex_dh_init(int, u_int32_t, void *); | 52 | static int input_kex_dh_init(int, u_int32_t, struct ssh *); |
53 | 53 | ||
54 | int | 54 | int |
55 | kexdh_server(struct ssh *ssh) | 55 | kexdh_server(struct ssh *ssh) |
@@ -91,9 +91,8 @@ kexdh_server(struct ssh *ssh) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | int | 93 | int |
94 | input_kex_dh_init(int type, u_int32_t seq, void *ctxt) | 94 | input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh) |
95 | { | 95 | { |
96 | struct ssh *ssh = ctxt; | ||
97 | struct kex *kex = ssh->kex; | 96 | struct kex *kex = ssh->kex; |
98 | BIGNUM *shared_secret = NULL, *dh_client_pub = NULL; | 97 | BIGNUM *shared_secret = NULL, *dh_client_pub = NULL; |
99 | struct sshkey *server_host_public, *server_host_private; | 98 | struct sshkey *server_host_public, *server_host_private; |