Merge the engine branch into the main trunk. All conflicts resolved.

[openssl.git] / crypto / dh / dh.h

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index a15fc1c65f7ec0fd6f3dd102d6355a9b49fcc711..7a8d9f88c2ebdb0d6171dec75cbb85710274e03f 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -115,7 +115,11 @@ struct dh_st
 
        int references;
        CRYPTO_EX_DATA ex_data;
+#if 0
        DH_METHOD *meth;
+#else
+       struct engine_st *engine;
+#endif
        };
 
 #define DH_GENERATOR_2         2
@@ -150,10 +154,15 @@ struct dh_st
 
 DH_METHOD *DH_OpenSSL(void);
 
-void DH_set_default_method(DH_METHOD *meth);
-DH_METHOD *DH_get_default_method(void);
+void DH_set_default_openssl_method(DH_METHOD *meth);
+DH_METHOD *DH_get_default_openssl_method(void);
+#if 0
 DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth);
 DH *DH_new_method(DH_METHOD *meth);
+#else
+int DH_set_method(DH *dh, struct engine_st *engine);
+DH *DH_new_method(struct engine_st *engine);
+#endif
 
 DH *   DH_new(void);
 void   DH_free(DH *dh);