AlgorithmIdentifier bugs

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

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 7a8d9f88c2ebdb0d6171dec75cbb85710274e03f..b43e3348478876fee0da3428db177ed8d5990dbf 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -115,11 +115,7 @@ 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
@@ -154,15 +150,10 @@ struct dh_st
 
 DH_METHOD *DH_OpenSSL(void);
 
-void DH_set_default_openssl_method(DH_METHOD *meth);
-DH_METHOD *DH_get_default_openssl_method(void);
-#if 0
+void DH_set_default_method(DH_METHOD *meth);
+DH_METHOD *DH_get_default_method(void);
 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);
@@ -186,12 +177,12 @@ int       DHparams_print(BIO *bp, DH *x);
 #else
 int    DHparams_print(char *bp, DH *x);
 #endif
-void   ERR_load_DH_strings(void );
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_DH_strings(void);
 
 /* Error codes for the DH functions. */
 
@@ -204,10 +195,10 @@ void      ERR_load_DH_strings(void );
 #define DH_F_DH_NEW                                     105
 
 /* Reason codes. */
+#define DH_R_BAD_GENERATOR                              101
 #define DH_R_NO_PRIVATE_VALUE                           100
 
 #ifdef  __cplusplus
 }
 #endif
 #endif
-