diff options
author | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-05 23:58:12 +0100 |
commit | 0556ea972b15607b7e13ff31bc05840881c91dd3 (patch) | |
tree | d6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /kexdhc.c | |
parent | db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff) | |
parent | 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff) |
New upstream release (7.6p1)
Diffstat (limited to 'kexdhc.c')
-rw-r--r-- | kexdhc.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhc.c,v 1.19 2016/05/02 10:26:04 djm Exp $ */ | 1 | /* $OpenBSD: kexdhc.c,v 1.20 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(int, u_int32_t, void *); | 52 | static int input_kex_dh(int, u_int32_t, struct ssh *); |
53 | 53 | ||
54 | int | 54 | int |
55 | kexdh_client(struct ssh *ssh) | 55 | kexdh_client(struct ssh *ssh) |
@@ -100,9 +100,8 @@ kexdh_client(struct ssh *ssh) | |||
100 | } | 100 | } |
101 | 101 | ||
102 | static int | 102 | static int |
103 | input_kex_dh(int type, u_int32_t seq, void *ctxt) | 103 | input_kex_dh(int type, u_int32_t seq, struct ssh *ssh) |
104 | { | 104 | { |
105 | struct ssh *ssh = ctxt; | ||
106 | struct kex *kex = ssh->kex; | 105 | struct kex *kex = ssh->kex; |
107 | BIGNUM *dh_server_pub = NULL, *shared_secret = NULL; | 106 | BIGNUM *dh_server_pub = NULL, *shared_secret = NULL; |
108 | struct sshkey *server_host_key = NULL; | 107 | struct sshkey *server_host_key = NULL; |