The OPENSSL_NO_ENGINE has small problem: it changes certain structures. That's

bad, so let's not check OPENSSL_NO_ENGINE in those places.  Fortunately, all
the header files where the problem existed include ossl_typ.h, which makes
a 'forward declaration' of the ENGINE type.

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 38214082f7ef168a08ac3184fc942aacb06e7a9c..62dba4055c7fc84e7ec77fa276c2684546ad0906 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -119,9 +119,7 @@ struct dh_st
        int references;
        CRYPTO_EX_DATA ex_data;
        const DH_METHOD *meth;
-#ifndef OPENSSL_NO_ENGINE
        ENGINE *engine;
-#endif
        };
 
 #define DH_GENERATOR_2         2

diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 63fcce9a334a7a515005a2ede024c187cac239c3..6ba79b01dfe853d6cb2ecd6100b13cb3a918c1c5 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -142,10 +142,8 @@ struct dsa_st
        int references;
        CRYPTO_EX_DATA ex_data;
        const DSA_METHOD *meth;
-#ifndef OPENSSL_NO_ENGINE
        /* functional reference if 'meth' is ENGINE-provided */
        ENGINE *engine;
-#endif
        };
 
 #define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index a58ece3a408dd83a8607f1f50f8b205b3faecbac..b084a358096f22fd12831a76c21ef0d3e708bb18 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -277,9 +277,7 @@ struct env_md_st
 struct env_md_ctx_st
        {
        const EVP_MD *digest;
-#ifndef OPENSSL_NO_ENGINE
        ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */
-#endif
        unsigned long flags;
        void *md_data;
        } /* EVP_MD_CTX */;
@@ -351,9 +349,7 @@ typedef struct evp_cipher_info_st
 struct evp_cipher_ctx_st
        {
        const EVP_CIPHER *cipher;
-#ifndef OPENSSL_NO_ENGINE
        ENGINE *engine; /* functional reference if 'cipher' is ENGINE-provided */
-#endif
        int encrypt;            /* encrypt or decrypt */
        int buf_len;            /* number we have left */
 

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 68696f8219f0ccfe8f9405a37f785ccfb651bfe4..b005b4b0b37564092ab66d766344bc2ac4969856 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -128,10 +128,8 @@ struct rsa_st
        int pad;
        long version;
        const RSA_METHOD *meth;
-#ifndef OPENSSL_NO_ENGINE
        /* functional reference if 'meth' is ENGINE-provided */
        ENGINE *engine;
-#endif
        BIGNUM *n;
        BIGNUM *e;
        BIGNUM *d;