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 ba5d013b88a246a2601cb7b4ee55e39da718456a..05851f84294c3bc53b68793ed69f0c18aacfa80c 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -117,9 +117,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 6214ab45b67feed6d3ef0b0a576b0ae7f0625d76..9b3baadf2c49c95213dfe0cad1b4a25f9e5f0ccb 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -135,10 +135,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 4c343d644e836cc8357651ae532ec65e14051647..45a25f968d9fe81cec6b753f6382bd816bac2a0c 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -318,9 +318,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 */;
@@ -392,9 +390,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 d27d459997926b06601f00958579774e635212d5..b2e25e4e7c714a73449f437a107a002ab983c941 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -124,10 +124,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;