From db4f904fbb82bc5a786b1fc63231c34bd8f8ef42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 13 Jan 2006 08:39:22 +0000
Subject: [PATCH] Reorder includes to avoid compile errors, provide
 DH_new_method().

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16539 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/des/dh.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/des/dh.h b/lib/des/dh.h
index 4ec513214..768a38ee9 100644
--- a/lib/des/dh.h
+++ b/lib/des/dh.h
@@ -38,11 +38,10 @@
 #ifndef _HEIM_DH_H
 #define _HEIM_DH_H 1
 
-#include <bn.h>
-
 /* symbol renaming */
 #define DH_null_method hc_DH_null_method
 #define DH_new hc_DH_new
+#define DH_new_method hc_DH_new_method
 #define DH_free hc_DH_free
 #define DH_up_ref hc_DH_up_ref
 #define DH_size hc_DH_size
@@ -64,6 +63,9 @@
 typedef struct DH DH;
 typedef struct DH_METHOD DH_METHOD;
 
+#include <bn.h>
+#include <engine.h>
+
 struct DH_METHOD {
     const char *name;
     int (*generate_key)(DH *);
@@ -99,7 +101,7 @@ struct DH {
 	int dummy;
     } ex_data;
     const DH_METHOD *meth;
-    void *engine;
+    ENGINE *engine;
 };
 
 /*
@@ -109,6 +111,7 @@ struct DH {
 const DH_METHOD *DH_null_method(void);
 
 DH *	DH_new(void);
+DH *	DH_new_method(ENGINE *);
 void	DH_free(DH *);
 int	DH_up_ref(DH *);