generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for no-static-engine and Windows builds.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2013-11-21 15:47:19 +00:00
parent d9519a4032
commit b70e4d3e90
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/engine/eng_all.c
View File

@@ -102,14 +102,14 @@ void ENGINE_load_builtin_engines(void)
#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP) #if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
ENGINE_load_gmp(); ENGINE_load_gmp();
#endif #endif
#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
ENGINE_load_capi();
#endif
#endif #endif
#ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
ENGINE_load_cryptodev(); ENGINE_load_cryptodev();
#endif #endif
#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
ENGINE_load_capi();
#endif
#endif #endif
} }

8
crypto/engine/engine.h
View File

@@ -335,15 +335,15 @@ void ENGINE_load_gmp(void);
void ENGINE_load_nuron(void); void ENGINE_load_nuron(void);
void ENGINE_load_sureware(void); void ENGINE_load_sureware(void);
void ENGINE_load_ubsec(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 #ifdef OPENSSL_SYS_WIN32
#ifndef OPENSSL_NO_CAPIENG #ifndef OPENSSL_NO_CAPIENG
void ENGINE_load_capi(void); void ENGINE_load_capi(void);
#endif #endif
#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 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
* "registry" handling. */ * "registry" handling. */

2
util/libeay.num
View File

@@ -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_function 4045 EXIST:!VMS:FUNCTION:ENGINE
ENGINE_get_ssl_client_cert_fn 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_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: OPENSSL_isservice 4048 EXIST::FUNCTION:
FIPS_dsa_sig_decode 4049 EXIST:OPENSSL_FIPS:FUNCTION:DSA FIPS_dsa_sig_decode 4049 EXIST:OPENSSL_FIPS:FUNCTION:DSA
EVP_CIPHER_CTX_clear_flags 4050 EXIST::FUNCTION: EVP_CIPHER_CTX_clear_flags 4050 EXIST::FUNCTION:

2
util/pl/VC-32.pl
View File

@@ -337,7 +337,7 @@ sub do_lib_rule
else else
{ {
my $ex = ""; my $ex = "";
if ($target =~ /O_SSL/) if ($target !~ /O_CRYPTO/)
{ {
$ex .= " \$(L_CRYPTO)"; $ex .= " \$(L_CRYPTO)";
#$ex .= " \$(L_FIPS)" if $fipsdso; #$ex .= " \$(L_FIPS)" if $fipsdso;