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

stop warnings about no previous prototype when compiling shared engines

parent 225c2721

crypto/engine/engine.h

+3 −0
Original line number Diff line number Diff line
@@ -678,6 +678,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; }
@@ -700,6 +701,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
@@ -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

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

+10 −0
Original line number Diff line number Diff line
@@ -107,9 +107,13 @@ 
     ) || \

     (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)

{
@@ -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