diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2003-01-30 15:49:03 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2003-01-30 15:49:03 +0000 |
| commit | f3c22ef10de7a506f0c127892835961c7f07837c (patch) | |
| tree | be2828e549a7b247c27ffbd76c78858e1b0b7f75 /crypto/engine | |
| parent | a85bef18995496a5f503350d921b2c98686cd12e (diff) | |
| download | openssl-f3c22ef10de7a506f0c127892835961c7f07837c.zip openssl-f3c22ef10de7a506f0c127892835961c7f07837c.tar.gz openssl-f3c22ef10de7a506f0c127892835961c7f07837c.tar.bz2 | |
This glues the GMP wrapper ENGINE into OpenSSL if it is being built (ie. if
the OPENSSL_USE_GMP symbol is defined). Also, I've re-ordered the listing
of other builtin ENGINEs to be alphabetical (though "dynamic" will still
come first).
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_all.c | 25 | ||||
| -rw-r--r-- | crypto/engine/engine.h | 11 |
2 files changed, 20 insertions, 16 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index 7cc05bf..64ec2db 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -72,34 +72,37 @@ void ENGINE_load_builtin_engines(void) ENGINE_load_dynamic(); #ifndef OPENSSL_NO_STATIC_ENGINE #ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_4758_CCA + ENGINE_load_4758cca(); +#endif +#ifndef OPENSSL_NO_HW_AEP + ENGINE_load_aep(); +#endif +#ifndef OPENSSL_NO_HW_ATALLA + ENGINE_load_atalla(); +#endif #ifndef OPENSSL_NO_HW_CSWIFT ENGINE_load_cswift(); #endif #ifndef OPENSSL_NO_HW_NCIPHER ENGINE_load_chil(); #endif -#ifndef OPENSSL_NO_HW_ATALLA - ENGINE_load_atalla(); -#endif #ifndef OPENSSL_NO_HW_NURON ENGINE_load_nuron(); #endif -#ifndef OPENSSL_NO_HW_UBSEC - ENGINE_load_ubsec(); -#endif -#ifndef OPENSSL_NO_HW_AEP - ENGINE_load_aep(); -#endif #ifndef OPENSSL_NO_HW_SUREWARE ENGINE_load_sureware(); #endif -#ifndef OPENSSL_NO_HW_4758_CCA - ENGINE_load_4758cca(); +#ifndef OPENSSL_NO_HW_UBSEC + ENGINE_load_ubsec(); #endif #endif #if defined(__OpenBSD__) || defined(__FreeBSD__) ENGINE_load_cryptodev(); #endif +#if defined(OPENSSL_USE_GMP) && !defined(OPENSSL_NO_HW_GMP) + ENGINE_load_gmp(); +#endif #endif } diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index 8ed684c..44b3849 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -320,14 +320,15 @@ ENGINE *ENGINE_by_id(const char *id); void ENGINE_load_openssl(void); void ENGINE_load_dynamic(void); #ifndef OPENSSL_NO_STATIC_ENGINE -void ENGINE_load_cswift(void); -void ENGINE_load_chil(void); +void ENGINE_load_4758cca(void); +void ENGINE_load_aep(void); void ENGINE_load_atalla(void); +void ENGINE_load_chil(void); +void ENGINE_load_cswift(void); +void ENGINE_load_gmp(void); void ENGINE_load_nuron(void); -void ENGINE_load_ubsec(void); -void ENGINE_load_aep(void); void ENGINE_load_sureware(void); -void ENGINE_load_4758cca(void); +void ENGINE_load_ubsec(void); #endif void ENGINE_load_cryptodev(void); void ENGINE_load_builtin_engines(void); |