X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdh%2Fdh.h;h=a15fc1c65f7ec0fd6f3dd102d6355a9b49fcc711;hb=c5f8bbbc0b94f3ec3f3f8f2aabbe3cc81f7b8158;hp=c41ace5bea74c7a57bb16af8ae5d1109d54e656c;hpb=dd9d233e2aa493fa1398b527afbf6aa5cdb23f23;p=oweals%2Fopenssl.git

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index c41ace5bea..a15fc1c65f 100644
--- 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;
 
@@ -169,7 +172,7 @@ 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);