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.

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

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, \

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 */
 

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;