Commit f8a123b4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

stop warnings about no previous prototype when compiling shared engines

parent c64beae6

crypto/engine/engine.h

+3 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ typedef struct st_dynamic_fns { 
 * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */

typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);

#define IMPLEMENT_DYNAMIC_CHECK_FN() \

	OPENSSL_EXPORT unsigned long v_check(unsigned long v); \

	OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \

		if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \

		return 0; }
@@ -699,6 +700,8 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version); 
typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,

				const dynamic_fns *fns);

#define IMPLEMENT_DYNAMIC_BIND_FN(fn) \

	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) { \

		if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \

engines/e_capi.c

+2 −0
Original line number Diff line number Diff line
@@ -1814,6 +1814,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

engines/e_gmp.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */

engines/e_padlock.c

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ static ENGINE *ENGINE_padlock (void); 
# endif

#endif



#ifdef OPENSSL_NO_DYNAMIC_ENGINE



void ENGINE_load_padlock (void)

{

/* On non-x86 CPUs it just returns. */
@@ -120,6 +122,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... */
@@ -1218,6 +1222,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