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
This commit is contained in:
Love Hörnquist Åstrand
2006-01-13 08:39:22 +00:00
parent fc22d50a39
commit db4f904fbb

View File

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