From 660621b2106b987b874c2f120218bec249d0f6ba Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 4 Nov 2013 08:37:51 +1100 Subject: [PATCH] - markus@cvs.openbsd.org 2013/11/02 22:24:24 [kexdhs.c kexecdhs.c] no need to include ssh-gss.h --- ChangeLog | 3 +++ kexdhs.c | 5 +---- kexecdhs.c | 5 +---- 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 @@ - markus@cvs.openbsd.org 2013/11/02 22:10:15 [kexdhs.c kexecdhs.c] no need to include monitor_wrap.h + - markus@cvs.openbsd.org 2013/11/02 22:24:24 + [kexdhs.c kexecdhs.c] + no need to include ssh-gss.h 20131103 - (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 @@ -/* $OpenBSD: kexdhs.c,v 1.15 2013/11/02 22:10:15 markus Exp $ */ +/* $OpenBSD: kexdhs.c,v 1.16 2013/11/02 22:24:24 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -42,9 +42,6 @@ #include "packet.h" #include "dh.h" #include "ssh2.h" -#ifdef GSSAPI -#include "ssh-gss.h" -#endif void kexdh_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 @@ -/* $OpenBSD: kexecdhs.c,v 1.6 2013/11/02 22:10:15 markus Exp $ */ +/* $OpenBSD: kexecdhs.c,v 1.7 2013/11/02 22:24:24 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -38,9 +38,6 @@ #include "log.h" #include "packet.h" #include "ssh2.h" -#ifdef GSSAPI -#include "ssh-gss.h" -#endif #ifdef OPENSSL_HAS_ECC