summaryrefslogtreecommitdiff
path: root/kexdhc.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-04 11:23:58 +0100
commit62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch)
tree3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /kexdhc.c
parent6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff)
parent66bf74a92131b7effe49fb0eefe5225151869dc5 (diff)
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'kexdhc.c')
-rw-r--r--kexdhc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kexdhc.c b/kexdhc.c
index ad3975f09..9864ee2ec 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -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
52static int input_kex_dh(int, u_int32_t, void *); 52static int input_kex_dh(int, u_int32_t, struct ssh *);
53 53
54int 54int
55kexdh_client(struct ssh *ssh) 55kexdh_client(struct ssh *ssh)
@@ -100,9 +100,8 @@ kexdh_client(struct ssh *ssh)
100} 100}
101 101
102static int 102static int
103input_kex_dh(int type, u_int32_t seq, void *ctxt) 103input_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;