diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-11-21 15:47:19 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-11-21 15:49:34 +0000 |
| commit | b70e4d3e904e30796efaed77ac149e4b9e945826 (patch) | |
| tree | 017befcaac27368449f87ca282a4ebdb516ad6bf /crypto | |
| parent | d9519a4032c082ff6805ab2de70a40034aad3894 (diff) | |
Fixes for no-static-engine and Windows builds.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/engine/eng_all.c | 6 | ||||
| -rw-r--r-- | crypto/engine/engine.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index f29c167c06..8a1b9c7c6a 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -102,14 +102,14 @@ void ENGINE_load_builtin_engines(void) #if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP) ENGINE_load_gmp(); #endif +#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) + ENGINE_load_capi(); +#endif #endif #ifndef OPENSSL_NO_HW #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_load_cryptodev(); #endif -#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - ENGINE_load_capi(); -#endif #endif } diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index d4bc1efc79..b4e0444fb8 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -335,15 +335,15 @@ void ENGINE_load_gmp(void); void ENGINE_load_nuron(void); void ENGINE_load_sureware(void); void ENGINE_load_ubsec(void); -#endif -void ENGINE_load_cryptodev(void); -void ENGINE_load_padlock(void); -void ENGINE_load_builtin_engines(void); #ifdef OPENSSL_SYS_WIN32 #ifndef OPENSSL_NO_CAPIENG void ENGINE_load_capi(void); #endif #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 * "registry" handling. */ |