summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--kexdhs.c5
-rw-r--r--kexecdhs.c5
3 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index eb72e3704..8b7378443 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
11 - markus@cvs.openbsd.org 2013/11/02 22:10:15 11 - markus@cvs.openbsd.org 2013/11/02 22:10:15
12 [kexdhs.c kexecdhs.c] 12 [kexdhs.c kexecdhs.c]
13 no need to include monitor_wrap.h 13 no need to include monitor_wrap.h
14 - markus@cvs.openbsd.org 2013/11/02 22:24:24
15 [kexdhs.c kexecdhs.c]
16 no need to include ssh-gss.h
14 17
1520131103 1820131103
16 - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep. 19 - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep.
diff --git a/kexdhs.c b/kexdhs.c
index cceb9ff08..39b9aba54 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexdhs.c,v 1.15 2013/11/02 22:10:15 markus Exp $ */ 1/* $OpenBSD: kexdhs.c,v 1.16 2013/11/02 22:24:24 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -42,9 +42,6 @@
42#include "packet.h" 42#include "packet.h"
43#include "dh.h" 43#include "dh.h"
44#include "ssh2.h" 44#include "ssh2.h"
45#ifdef GSSAPI
46#include "ssh-gss.h"
47#endif
48 45
49void 46void
50kexdh_server(Kex *kex) 47kexdh_server(Kex *kex)
diff --git a/kexecdhs.c b/kexecdhs.c
index ab8a2b1f9..431fd2c2c 100644
--- a/kexecdhs.c
+++ b/kexecdhs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexecdhs.c,v 1.6 2013/11/02 22:10:15 markus Exp $ */ 1/* $OpenBSD: kexecdhs.c,v 1.7 2013/11/02 22:24:24 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.
@@ -38,9 +38,6 @@
38#include "log.h" 38#include "log.h"
39#include "packet.h" 39#include "packet.h"
40#include "ssh2.h" 40#include "ssh2.h"
41#ifdef GSSAPI
42#include "ssh-gss.h"
43#endif
44 41
45#ifdef OPENSSL_HAS_ECC 42#ifdef OPENSSL_HAS_ECC
46 43