summaryrefslogtreecommitdiffstats
path: root/crypto/dh
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2004-04-19 17:46:04 +0000
committerGeoff Thorpe <geoff@openssl.org>2004-04-19 17:46:04 +0000
commit3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 (patch)
tree543949ed3523920985fe649a5ebe3945c8112391 /crypto/dh
parentae44fc1ec4c0d6c125c28f52dc06e9ae87c59c4c (diff)
Reduce header interdependencies, initially in engine.h (the rest of the
changes are the fallout). As this could break source code that doesn't directly include headers for interfaces it uses, changes to recursive includes are covered by the OPENSSL_NO_DEPRECATED symbol. It's better to define this when building and using openssl, and then adapt code where necessary - this is how to stay current. However the mechanism exists for the lethargic.
Diffstat (limited to 'crypto/dh')
-rw-r--r--crypto/dh/dh.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index db4e11090d..28a1b4208d 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -78,9 +78,12 @@
extern "C" {
#endif
-typedef struct dh_st DH;
+/* Already defined in ossl_typ.h */
+/* typedef struct dh_st DH; */
+/* typedef struct dh_method DH_METHOD; */
-typedef struct dh_method {
+struct dh_method
+ {
const char *name;
/* Methods here */
int (*generate_key)(DH *dh);
@@ -95,7 +98,7 @@ typedef struct dh_method {
char *app_data;
/* If this is non-NULL, it will be used to generate parameters */
int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb);
-} DH_METHOD;
+ };
struct dh_st
{