OpenSSL 0.9.4 merge

1 files changed, 20 insertions, 24 deletions

diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
index 4cc1df2650..2cc3797a94 100644
--- a/src/lib/libcrypto/dh/dh.h
+++ b/src/lib/libcrypto/dh/dh.h
@@ -63,10 +63,14 @@
 extern "C" {
 #endif
 
-#ifndef HEADER_BN_H
-#define BIGNUM          char
+#ifdef NO_DH
+#error DH is disabled.
 #endif
 
+#include <openssl/bn.h>
+        
+#define DH_FLAG_CACHE_MONT_P    0x01
+
 typedef struct dh_st
         {
         /* This first argument is used to pick up errors when
@@ -78,6 +82,9 @@ typedef struct dh_st
         int length; /* optional */
         BIGNUM *pub_key;        /* y */
         BIGNUM *priv_key;       /* x */
+
+        int flags;
+        char *method_mont_p;
         } DH;
 
 #define DH_GENERATOR_2          2
@@ -98,15 +105,19 @@ typedef struct dh_st
                 (unsigned char *)(x))
 #define d2i_DHparams_bio(bp,x) (DH *)ASN1_d2i_bio((char *(*)())DH_new, \
                 (char *(*)())d2i_DHparams,(bp),(unsigned char **)(x))
+#ifdef  __cplusplus
+#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio((int (*)())i2d_DHparams,(bp), \
+                (unsigned char *)(x))
+#else
 #define i2d_DHparams_bio(bp,x) ASN1_i2d_bio(i2d_DHparams,(bp), \
                 (unsigned char *)(x))
+#endif
 
-#ifndef NOPROTO
 DH *    DH_new(void);
 void    DH_free(DH *dh);
 int     DH_size(DH *dh);
 DH *    DH_generate_parameters(int prime_len,int generator,
-                void (*callback)(int,int,char *),char *cb_arg);
+                void (*callback)(int,int,void *),void *cb_arg);
 int     DH_check(DH *dh,int *codes);
 int     DH_generate_key(DH *dh);
 int     DH_compute_key(unsigned char *key,BIGNUM *pub_key,DH *dh);
@@ -122,26 +133,11 @@ int	DHparams_print(char *bp, DH *x);
 #endif
 void    ERR_load_DH_strings(void );
 
-#else
-
-DH *    DH_new();
-void    DH_free();
-int     DH_size();
-DH *    DH_generate_parameters();
-int     DH_check();
-int     DH_generate_key();
-int     DH_compute_key();
-DH *    d2i_DHparams();
-int     i2d_DHparams();
-#ifndef NO_FP_API
-int     DHparams_print_fp();
-#endif
-int     DHparams_print();
-void    ERR_load_DH_strings();
-
-#endif
-
 /* 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.
+ */
+
 /* Error codes for the DH functions. */
 
 /* Function codes. */
@@ -154,7 +150,7 @@ void	ERR_load_DH_strings();
 
 /* Reason codes. */
 #define DH_R_NO_PRIVATE_VALUE                            100
- 
+
 #ifdef  __cplusplus
 }
 #endif