AlgorithmIdentifier bugs

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

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index c96cdde968cd6d229d9a30735807ffd07f28a7fe..b43e3348478876fee0da3428db177ed8d5990dbf 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -59,19 +59,22 @@
 #ifndef HEADER_DH_H
 #define HEADER_DH_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 #ifdef NO_DH
 #error DH is disabled.
 #endif
 
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
        
 #define DH_FLAG_CACHE_MONT_P   0x01
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct dh_st DH;
 
 typedef struct dh_method {
@@ -106,7 +109,7 @@ struct dh_st
        /* Place holders if we want to do X9.42 DH */
        BIGNUM *q;
        BIGNUM *j;
-       unsigned *seed;
+       unsigned char *seed;
        int seedlen;
        BIGNUM *counter;
 
@@ -155,10 +158,10 @@ DH *DH_new_method(DH_METHOD *meth);
 DH *   DH_new(void);
 void   DH_free(DH *dh);
 int    DH_size(DH *dh);
-int DH_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-            int (*dup_func)(), void (*free_func)());
-int DH_set_ex_data(DH *d, int idx, char *arg);
-char *DH_get_ex_data(DH *d, int idx);
+int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+            CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int DH_set_ex_data(DH *d, int idx, void *arg);
+void *DH_get_ex_data(DH *d, int idx);
 DH *   DH_generate_parameters(int prime_len,int generator,
                void (*callback)(int,int,void *),void *cb_arg);
 int    DH_check(DH *dh,int *codes);
@@ -169,17 +172,17 @@ int       i2d_DHparams(DH *a,unsigned char **pp);
 #ifndef NO_FP_API
 int    DHparams_print_fp(FILE *fp, DH *x);
 #endif
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
 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. */
 
@@ -192,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
-