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

Fixes for no-static-engine and Windows builds.

parent d9519a40

crypto/engine/eng_all.c

+3 −3
Original line number Diff line number Diff line
@@ -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

	}

crypto/engine/engine.h

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

util/libeay.num

+1 −1
Original line number Diff line number Diff line
@@ -3658,7 +3658,7 @@ ENGINE_set_ld_ssl_clnt_cert_fn 4044 EXIST:VMS:FUNCTION:ENGINE 
ENGINE_get_ssl_client_cert_function     4045	EXIST:!VMS:FUNCTION:ENGINE

ENGINE_get_ssl_client_cert_fn           4045	EXIST:VMS:FUNCTION:ENGINE

ENGINE_load_ssl_client_cert             4046	EXIST::FUNCTION:ENGINE

ENGINE_load_capi                        4047	EXIST:WIN32:FUNCTION:CAPIENG,ENGINE

ENGINE_load_capi                        4047	EXIST:WIN32:FUNCTION:CAPIENG,ENGINE,STATIC_ENGINE

OPENSSL_isservice                       4048	EXIST::FUNCTION:

FIPS_dsa_sig_decode                     4049	EXIST:OPENSSL_FIPS:FUNCTION:DSA

EVP_CIPHER_CTX_clear_flags              4050	EXIST::FUNCTION:

util/pl/VC-32.pl

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ sub do_lib_rule 
	else

		{

		my $ex = "";		

		if ($target =~ /O_SSL/)

		if ($target !~ /O_CRYPTO/)

			{

			$ex .= " \$(L_CRYPTO)";

			#$ex .= " \$(L_FIPS)" if $fipsdso;