diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-01-30 02:30:48 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-01-30 02:30:48 +0100 |
| commit | eb164d0b12485292faee35770a4ce2f48976aa1f (patch) | |
| tree | d2db7081979b4fb034d887e51d13acddfaf695d4 /engines | |
| parent | Fix shared build for fips (diff) | |
| download | openssl-eb164d0b12485292faee35770a4ce2f48976aa1f.tar.xz openssl-eb164d0b12485292faee35770a4ce2f48976aa1f.zip | |
stop warnings about no previous prototype when compiling shared engines
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_capi.c | 2 | ||||
| -rw-r--r-- | engines/e_gmp.c | 2 | ||||
| -rw-r--r-- | engines/e_padlock.c | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c index 1925bad5c1..d4cfdfe4ec 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -1886,6 +1886,8 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs) #include <openssl/engine.h> #ifndef OPENSSL_NO_DYNAMIC_ENGINE OPENSSL_EXPORT +int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); +OPENSSL_EXPORT int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; } IMPLEMENT_DYNAMIC_CHECK_FN() #else diff --git a/engines/e_gmp.c b/engines/e_gmp.c index c1f5601b62..a3d47151ea 100644 --- a/engines/e_gmp.c +++ b/engines/e_gmp.c @@ -471,6 +471,8 @@ static int bind_fn(ENGINE *e, const char *id) IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) #else OPENSSL_EXPORT +int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); +OPENSSL_EXPORT int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; } #endif #endif /* !OPENSSL_NO_DYNAMIC_ENGINE */ diff --git a/engines/e_padlock.c b/engines/e_padlock.c index 240b1f9b57..ce7e086553 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -107,10 +107,14 @@ ) || \ (defined(_MSC_VER) && defined(_M_IX86)) # define COMPILE_HW_PADLOCK +# ifdef OPENSSL_NO_DYNAMIC_ENGINE static ENGINE *ENGINE_padlock (void); +# endif # endif #endif +#ifdef OPENSSL_NO_DYNAMIC_ENGINE + void ENGINE_load_padlock (void) { /* On non-x86 CPUs it just returns. */ @@ -123,6 +127,8 @@ void ENGINE_load_padlock (void) #endif } +#endif + #ifdef COMPILE_HW_PADLOCK /* We do these includes here to avoid header problems on platforms that do not have the VIA padlock anyway... */ @@ -196,6 +202,7 @@ padlock_bind_helper(ENGINE *e) return 1; } +#ifdef OPENSSL_NO_DYNAMIC_ENGINE /* Constructor */ static ENGINE * ENGINE_padlock(void) @@ -213,6 +220,7 @@ ENGINE_padlock(void) return eng; } +#endif /* Check availability of the engine */ static int @@ -1322,6 +1330,8 @@ static RAND_METHOD padlock_rand = { #else /* !COMPILE_HW_PADLOCK */ #ifndef OPENSSL_NO_DYNAMIC_ENGINE OPENSSL_EXPORT +int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); +OPENSSL_EXPORT int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; } IMPLEMENT_DYNAMIC_CHECK_FN() #endif |