diff options
| author | Richard Levitte <levitte@openssl.org> | 2010-01-27 11:14:46 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2010-01-27 11:14:46 +0000 |
| commit | e6d8d6a89ae491106ff5860bcd339f1469ca350f (patch) | |
| tree | bf5eb7cff5c855f24213c665470d57d9bc96b969 /engines/e_atalla.c | |
| parent | 0e785e5e093d4c24eaf531dd5ffc655e3a91c6b5 (diff) | |
| download | openssl-new-e6d8d6a89ae491106ff5860bcd339f1469ca350f.tar.gz | |
Merge main -> VMS_64BITBRANCH_VMS_64BIT
Diffstat (limited to 'engines/e_atalla.c')
| -rw-r--r-- | engines/e_atalla.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/engines/e_atalla.c b/engines/e_atalla.c index a5cf6aa885..fabaa86a52 100644 --- a/engines/e_atalla.c +++ b/engines/e_atalla.c @@ -62,9 +62,15 @@ #include <openssl/buffer.h> #include <openssl/dso.h> #include <openssl/engine.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif +#ifndef OPENSSL_NO_DH #include <openssl/dh.h> +#endif #include <openssl/bn.h> #ifndef OPENSSL_NO_HW @@ -91,10 +97,10 @@ static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, #ifndef OPENSSL_NO_RSA /* RSA stuff */ static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); -#endif /* This function is aliased to mod_exp (with the mont stuff dropped). */ static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); +#endif #ifndef OPENSSL_NO_DSA /* DSA stuff */ @@ -384,6 +390,7 @@ static int atalla_init(ENGINE *e) err: if(atalla_dso) DSO_free(atalla_dso); + atalla_dso = NULL; p_Atalla_GetHardwareConfig = NULL; p_Atalla_RSAPrivateKeyOpFn = NULL; p_Atalla_GetPerformanceStatistics = NULL; @@ -562,12 +569,14 @@ static int atalla_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, } #endif +#ifndef OPENSSL_NO_RSA /* This function is aliased to mod_exp (with the mont stuff dropped). */ static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) { return atalla_mod_exp(r, a, p, m, ctx); } +#endif #ifndef OPENSSL_NO_DH /* This function is aliased to mod_exp (with the dh and mont dropped). */ |