summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-07-24 14:05:24 +1000
committerDamien Miller <djm@mindrot.org>2006-07-24 14:05:24 +1000
commitf757d22e8b72b04d5a9228e2075649ded14314db (patch)
tree9f1dbf9859642b0eda94536c1488fda5af70e515
parent8c23403b5141b2cc570a8b55805855eea93d875a (diff)
- stevesk@cvs.openbsd.org 2006/07/18 22:27:55
[dh.c] remove unneeded includes; ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--dh.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6eda0ee69..11e218d4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
49 - dtucker@cvs.openbsd.org 2006/07/18 08:22:23 49 - dtucker@cvs.openbsd.org 2006/07/18 08:22:23
50 [sshd_config.5] 50 [sshd_config.5]
51 Clarify description of Match, with minor correction from jmc@ 51 Clarify description of Match, with minor correction from jmc@
52 - stevesk@cvs.openbsd.org 2006/07/18 22:27:55
53 [dh.c]
54 remove unneeded includes; ok djm@
52 55
5320060713 5620060713
54 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h 57 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4967,4 +4970,4 @@
4967 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4970 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4968 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4971 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4969 4972
4970$Id: ChangeLog,v 1.4419 2006/07/24 04:05:08 djm Exp $ 4973$Id: ChangeLog,v 1.4420 2006/07/24 04:05:24 djm Exp $
diff --git a/dh.c b/dh.c
index b3f4ceef1..ff31ca991 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh.c,v 1.36 2006/05/04 14:55:23 djm Exp $ */ 1/* $OpenBSD: dh.c,v 1.37 2006/07/18 22:27:55 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * 4 *
@@ -25,15 +25,9 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include "xmalloc.h"
29
30#include <openssl/bn.h> 28#include <openssl/bn.h>
31#include <openssl/dh.h> 29#include <openssl/dh.h>
32#include <openssl/evp.h>
33 30
34#include "buffer.h"
35#include "cipher.h"
36#include "kex.h"
37#include "dh.h" 31#include "dh.h"
38#include "pathnames.h" 32#include "pathnames.h"
39#include "log.h" 33#include "log.h"