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 /kexc25519c.c | |
parent | db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff) | |
parent | 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff) |
New upstream release (7.6p1)
Diffstat (limited to 'kexc25519c.c')
-rw-r--r-- | kexc25519c.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kexc25519c.c b/kexc25519c.c index b7ef65dc3..e488013e9 100644 --- a/kexc25519c.c +++ b/kexc25519c.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexc25519c.c,v 1.7 2015/01/26 06:10:03 djm Exp $ */ | 1 | /* $OpenBSD: kexc25519c.c,v 1.8 2017/05/31 04:17:12 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -44,7 +44,7 @@ | |||
44 | #include "ssherr.h" | 44 | #include "ssherr.h" |
45 | 45 | ||
46 | static int | 46 | static int |
47 | input_kex_c25519_reply(int type, u_int32_t seq, void *ctxt); | 47 | input_kex_c25519_reply(int type, u_int32_t seq, struct ssh *ssh); |
48 | 48 | ||
49 | int | 49 | int |
50 | kexc25519_client(struct ssh *ssh) | 50 | kexc25519_client(struct ssh *ssh) |
@@ -69,9 +69,8 @@ kexc25519_client(struct ssh *ssh) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | static int | 71 | static int |
72 | input_kex_c25519_reply(int type, u_int32_t seq, void *ctxt) | 72 | input_kex_c25519_reply(int type, u_int32_t seq, struct ssh *ssh) |
73 | { | 73 | { |
74 | struct ssh *ssh = ctxt; | ||
75 | struct kex *kex = ssh->kex; | 74 | struct kex *kex = ssh->kex; |
76 | struct sshkey *server_host_key = NULL; | 75 | struct sshkey *server_host_key = NULL; |
77 | struct sshbuf *shared_secret = NULL; | 76 | struct sshbuf *shared_secret = NULL; |