Commit 5fe11c75 authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent a1d57849

crypto/dh/dh.h

+0 −2
Original line number Diff line number Diff line
@@ -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

crypto/dsa/dsa.h

+0 −2
Original line number Diff line number Diff line
@@ -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, \

crypto/evp/evp.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */

crypto/rsa/rsa.h

+0 −2
Original line number Diff line number Diff line
@@ -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;