summaryrefslogtreecommitdiff
path: root/kexecdhc.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-05 23:58:12 +0100
commit0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
treed6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /kexecdhc.c
parentdb2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)
New upstream release (7.6p1)
Diffstat (limited to 'kexecdhc.c')
-rw-r--r--kexecdhc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kexecdhc.c b/kexecdhc.c
index 90220ce82..d8a8b660f 100644
--- a/kexecdhc.c
+++ b/kexecdhc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexecdhc.c,v 1.10 2015/01/26 06:10:03 djm Exp $ */ 1/* $OpenBSD: kexecdhc.c,v 1.11 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 * Copyright (c) 2010 Damien Miller. All rights reserved. 4 * Copyright (c) 2010 Damien Miller. All rights reserved.
@@ -49,7 +49,7 @@
49#include "ssherr.h" 49#include "ssherr.h"
50#include "sshbuf.h" 50#include "sshbuf.h"
51 51
52static int input_kex_ecdh_reply(int, u_int32_t, void *); 52static int input_kex_ecdh_reply(int, u_int32_t, struct ssh *);
53 53
54int 54int
55kexecdh_client(struct ssh *ssh) 55kexecdh_client(struct ssh *ssh)
@@ -95,9 +95,8 @@ kexecdh_client(struct ssh *ssh)
95} 95}
96 96
97static int 97static int
98input_kex_ecdh_reply(int type, u_int32_t seq, void *ctxt) 98input_kex_ecdh_reply(int type, u_int32_t seq, struct ssh *ssh)
99{ 99{
100 struct ssh *ssh = ctxt;
101 struct kex *kex = ssh->kex; 100 struct kex *kex = ssh->kex;
102 const EC_GROUP *group; 101 const EC_GROUP *group;
103 EC_POINT *server_public = NULL; 102 EC_POINT *server_public = NULL;