Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,

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

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 65d61e2bb7b47fc6acfc7a5ea069e5145d646509..62dba4055c7fc84e7ec77fa276c2684546ad0906 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -68,7 +68,7 @@
 #endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
-#include <openssl/types.h>
+#include <openssl/ossl_typ.h>
        
 #define DH_FLAG_CACHE_MONT_P   0x01
 
@@ -91,6 +91,8 @@ typedef struct dh_method {
        int (*finish)(DH *dh);
        int flags;
        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
@@ -101,7 +103,7 @@ struct dh_st
        int version;
        BIGNUM *p;
        BIGNUM *g;
-       int length; /* optional */
+       long length; /* optional */
        BIGNUM *pub_key;        /* g^x */
        BIGNUM *priv_key;       /* x */
 
@@ -165,8 +167,16 @@ 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);
+
+/* Deprecated version */
+#ifndef OPENSSL_NO_DEPRECATED
 DH *   DH_generate_parameters(int prime_len,int generator,
                void (*callback)(int,int,void *),void *cb_arg);
+#endif /* !defined(OPENSSL_NO_DEPRECATED) */
+
+/* New version */
+int    DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb);
+
 int    DH_check(const DH *dh,int *codes);
 int    DH_generate_key(DH *dh);
 int    DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
@@ -180,12 +190,12 @@ int       DHparams_print(BIO *bp, const DH *x);
 #else
 int    DHparams_print(char *bp, const 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. */
 
@@ -195,13 +205,13 @@ void      ERR_load_DH_strings(void);
 #define DH_F_DH_COMPUTE_KEY                             102
 #define DH_F_DH_GENERATE_KEY                            103
 #define DH_F_DH_GENERATE_PARAMETERS                     104
-#define DH_F_DH_NEW                                     105
+#define DH_F_DH_NEW_METHOD                              105
 
 /* Reason codes. */
+#define DH_R_BAD_GENERATOR                              101
 #define DH_R_NO_PRIVATE_VALUE                           100
 
 #ifdef  __cplusplus
 }
 #endif
 #endif
-