diff options
| author | Andy Polyakov <appro@openssl.org> | 2006-12-29 10:55:43 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2006-12-29 10:55:43 +0000 |
| commit | bb11c2824642d8263f664f19ca870d5e99ebd485 (patch) | |
| tree | 322633707e9b6be3a43d827c811a53b571868fe0 /crypto/engine | |
| parent | 8d9f136d064294fb05152cc88a1e5f1d0f93fbe3 (diff) | |
Minor clean-up in crypto/engine.
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_all.c | 12 | ||||
| -rw-r--r-- | crypto/engine/engine.h | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index 36ec2ebbdb..fb01ca8972 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -61,13 +61,16 @@ void ENGINE_load_builtin_engines(void) { +#if 0 /* There's no longer any need for an "openssl" ENGINE unless, one day, * it is the *only* way for standard builtin implementations to be be * accessed (ie. it would be possible to statically link binaries with * *no* builtin implementations). */ -#if 0 ENGINE_load_openssl(); #endif +#if defined(__OpenBSD__) || defined(__FreeBSD__) + ENGINE_load_cryptodev(); +#endif ENGINE_load_dynamic(); #ifndef OPENSSL_NO_STATIC_ENGINE #ifndef OPENSSL_NO_HW @@ -98,14 +101,11 @@ void ENGINE_load_builtin_engines(void) #ifndef OPENSSL_NO_HW_PADLOCK ENGINE_load_padlock(); #endif +#endif #ifndef OPENSSL_NO_GOST ENGINE_load_gost(); #endif -#endif -#if defined(__OpenBSD__) || defined(__FreeBSD__) - ENGINE_load_cryptodev(); -#endif -#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP) +#ifndef OPENSSL_NO_GMP ENGINE_load_gmp(); #endif #endif diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index a2067dcda2..56aaa594ed 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -327,16 +327,18 @@ void ENGINE_load_aep(void); void ENGINE_load_atalla(void); void ENGINE_load_chil(void); void ENGINE_load_cswift(void); -#ifndef OPENSSL_NO_GMP -void ENGINE_load_gmp(void); -#endif void ENGINE_load_nuron(void); void ENGINE_load_sureware(void); void ENGINE_load_ubsec(void); +void ENGINE_load_padlock(void); +#ifndef OPENSSL_NO_GMP +void ENGINE_load_gmp(void); +#endif +#ifndef OPENSSL_NO_GOST void ENGINE_load_gost(void); #endif +#endif void ENGINE_load_cryptodev(void); -void ENGINE_load_padlock(void); void ENGINE_load_builtin_engines(void); /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation |