1 files changed, 22 insertions, 7 deletions

diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
index 68d9912cbc..65689a3426 100644
--- a/src/lib/libcrypto/dsa/dsa.h
+++ b/src/lib/libcrypto/dsa/dsa.h
@@ -65,14 +65,13 @@
 #ifndef HEADER_DSA_H
 #define HEADER_DSA_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 #ifdef NO_DSA
 #error DSA is disabled.
 #endif
 
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 #ifndef NO_DH
@@ -81,6 +80,10 @@ extern "C" {
 
 #define DSA_FLAG_CACHE_MONT_P   0x01
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct dsa_st DSA;
 
 typedef struct DSA_SIG_st
@@ -130,7 +133,11 @@ struct dsa_st
         char *method_mont_p;
         int references;
         CRYPTO_EX_DATA ex_data;
+#if 0
         DSA_METHOD *meth;
+#else
+        struct engine_st *engine;
+#endif
         };
 
 #define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \
@@ -156,12 +163,20 @@ int	DSA_do_verify(const unsigned char *dgst,int dgst_len,
 
 DSA_METHOD *DSA_OpenSSL(void);
 
-void        DSA_set_default_method(DSA_METHOD *);
-DSA_METHOD *DSA_get_default_method(void);
+void        DSA_set_default_openssl_method(DSA_METHOD *);
+DSA_METHOD *DSA_get_default_openssl_method(void);
+#if 0
 DSA_METHOD *DSA_set_method(DSA *dsa, DSA_METHOD *);
+#else
+int DSA_set_method(DSA *dsa, struct engine_st *engine);
+#endif
 
 DSA *   DSA_new(void);
+#if 0
 DSA *   DSA_new_method(DSA_METHOD *meth);
+#else
+DSA *   DSA_new_method(struct engine_st *engine);
+#endif
 int     DSA_size(DSA *);
         /* next 4 return -1 on error */
 int     DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);
@@ -188,7 +203,7 @@ int	i2d_DSAPublicKey(DSA *a, unsigned char **pp);
 int     i2d_DSAPrivateKey(DSA *a, unsigned char **pp);
 int     i2d_DSAparams(DSA *a,unsigned char **pp);
 
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
 int     DSAparams_print(BIO *bp, DSA *x);
 int     DSA_print(BIO *bp, DSA *x, int off);
 #endif