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 /kexgexs.c | |
parent | db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff) | |
parent | 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff) |
New upstream release (7.6p1)
Diffstat (limited to 'kexgexs.c')
-rw-r--r-- | kexgexs.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexs.c,v 1.30 2016/09/12 01:22:38 deraadt Exp $ */ | 1 | /* $OpenBSD: kexgexs.c,v 1.31 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. |
@@ -54,8 +54,8 @@ | |||
54 | #include "sshbuf.h" | 54 | #include "sshbuf.h" |
55 | #include "misc.h" | 55 | #include "misc.h" |
56 | 56 | ||
57 | static int input_kex_dh_gex_request(int, u_int32_t, void *); | 57 | static int input_kex_dh_gex_request(int, u_int32_t, struct ssh *); |
58 | static int input_kex_dh_gex_init(int, u_int32_t, void *); | 58 | static int input_kex_dh_gex_init(int, u_int32_t, struct ssh *); |
59 | 59 | ||
60 | int | 60 | int |
61 | kexgex_server(struct ssh *ssh) | 61 | kexgex_server(struct ssh *ssh) |
@@ -67,9 +67,8 @@ kexgex_server(struct ssh *ssh) | |||
67 | } | 67 | } |
68 | 68 | ||
69 | static int | 69 | static int |
70 | input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt) | 70 | input_kex_dh_gex_request(int type, u_int32_t seq, struct ssh *ssh) |
71 | { | 71 | { |
72 | struct ssh *ssh = ctxt; | ||
73 | struct kex *kex = ssh->kex; | 72 | struct kex *kex = ssh->kex; |
74 | int r; | 73 | int r; |
75 | u_int min = 0, max = 0, nbits = 0; | 74 | u_int min = 0, max = 0, nbits = 0; |
@@ -120,9 +119,8 @@ input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt) | |||
120 | } | 119 | } |
121 | 120 | ||
122 | static int | 121 | static int |
123 | input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) | 122 | input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh) |
124 | { | 123 | { |
125 | struct ssh *ssh = ctxt; | ||
126 | struct kex *kex = ssh->kex; | 124 | struct kex *kex = ssh->kex; |
127 | BIGNUM *shared_secret = NULL, *dh_client_pub = NULL; | 125 | BIGNUM *shared_secret = NULL, *dh_client_pub = NULL; |
128 | struct sshkey *server_host_public, *server_host_private; | 126 | struct sshkey *server_host_public, *server_host_private; |