wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Richard Levitte 2003-01-30 18:52:52 +00:00
parent 20dc821092
commit bd573ee31a
4 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crypto/dh/dh.h
View file

@ -117,9 +117,7 @@ struct dh_st
int references; int references;
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
const DH_METHOD *meth; const DH_METHOD *meth;
#ifndef OPENSSL_NO_ENGINE
ENGINE *engine; ENGINE *engine;
#endif
}; };
#define DH_GENERATOR_2 2 #define DH_GENERATOR_2 2

2
crypto/dsa/dsa.h
View file

@ -135,10 +135,8 @@ struct dsa_st
int references; int references;
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
const DSA_METHOD *meth; const DSA_METHOD *meth;
#ifndef OPENSSL_NO_ENGINE
/* functional reference if 'meth' is ENGINE-provided */ /* functional reference if 'meth' is ENGINE-provided */
ENGINE *engine; ENGINE *engine;
#endif
}; };
#define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \ #define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \

4
crypto/evp/evp.h
View file

@ -318,9 +318,7 @@ struct env_md_st
struct env_md_ctx_st struct env_md_ctx_st
{ {
const EVP_MD *digest; const EVP_MD *digest;
#ifndef OPENSSL_NO_ENGINE
ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */ ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */
#endif
unsigned long flags; unsigned long flags;
void *md_data; void *md_data;
} /* EVP_MD_CTX */; } /* EVP_MD_CTX */;
@ -392,9 +390,7 @@ typedef struct evp_cipher_info_st
struct evp_cipher_ctx_st struct evp_cipher_ctx_st
{ {
const EVP_CIPHER *cipher; const EVP_CIPHER *cipher;
#ifndef OPENSSL_NO_ENGINE
ENGINE *engine; /* functional reference if 'cipher' is ENGINE-provided */ ENGINE *engine; /* functional reference if 'cipher' is ENGINE-provided */
#endif
int encrypt; /* encrypt or decrypt */ int encrypt; /* encrypt or decrypt */
int buf_len; /* number we have left */ int buf_len; /* number we have left */

2
crypto/rsa/rsa.h
View file

@ -124,10 +124,8 @@ struct rsa_st
int pad; int pad;
long version; long version;
const RSA_METHOD *meth; const RSA_METHOD *meth;
#ifndef OPENSSL_NO_ENGINE
/* functional reference if 'meth' is ENGINE-provided */ /* functional reference if 'meth' is ENGINE-provided */
ENGINE *engine; ENGINE *engine;
#endif
BIGNUM *n; BIGNUM *n;
BIGNUM *e; BIGNUM *e;
BIGNUM *d; BIGNUM *d;