diff options
| author | Doubango Telecom <github@doubango.org> | 2016-08-02 22:00:59 +0200 |
|---|---|---|
| committer | Doubango Telecom <github@doubango.org> | 2016-08-02 22:00:59 +0200 |
| commit | 412f2cb2ba5fc1f5b2f019fdfddcac5518ed8aca (patch) | |
| tree | e5e70301295de347692292e24091a0efe1fb2f61 | |
| parent | a6e8cd78927b8a2115c051c9ce574241474a6ea4 (diff) | |
| download | doubango-412f2cb2ba5fc1f5b2f019fdfddcac5518ed8aca.zip doubango-412f2cb2ba5fc1f5b2f019fdfddcac5518ed8aca.tar.gz | |
Remove hard-coded openssl config
| -rw-r--r-- | thirdparties/common/include/openssl/opensslconf.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/thirdparties/common/include/openssl/opensslconf.h b/thirdparties/common/include/openssl/opensslconf.h index bc71549..e37ba39 100644 --- a/thirdparties/common/include/openssl/opensslconf.h +++ b/thirdparties/common/include/openssl/opensslconf.h @@ -5,8 +5,8 @@ extern "C" { #endif /* OpenSSL was configured with the following options: */ -#ifndef OPENSSL_SYSNAME_WIN32 -# define OPENSSL_SYSNAME_WIN32 +#ifndef OPENSSL_SYSNAME_MACOSX +//# define OPENSSL_SYSNAME_MACOSX #endif #ifndef OPENSSL_DOING_MAKEDEPEND @@ -59,6 +59,9 @@ extern "C" { #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif /* The OPENSSL_NO_* macros are also defined as NO_* if the application asks for it. This is a transient feature that is provided for those @@ -118,8 +121,8 @@ extern "C" { #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR "T:\\Build-OpenSSL-VC32-Release-DLL/lib/engines" -#define OPENSSLDIR "T:\\Build-OpenSSL-VC32-Release-DLL/ssl" +#define ENGINESDIR "/tmp/openssl-1.0.2h-i386/lib/engines" +#define OPENSSLDIR "/tmp/openssl-1.0.2h-i386" #endif #endif @@ -127,7 +130,6 @@ extern "C" { #define OPENSSL_UNISTD <unistd.h> #undef OPENSSL_EXPORT_VAR_AS_FUNCTION -#define OPENSSL_EXPORT_VAR_AS_FUNCTION #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #define IDEA_INT unsigned int @@ -158,7 +160,7 @@ extern "C" { * This enables code handling data aligned at natural CPU word * boundary. See crypto/rc4/rc4_enc.c for further details. */ -#undef RC4_CHUNK +#define RC4_CHUNK unsigned long #endif #endif @@ -186,12 +188,12 @@ extern "C" { #define CONFIG_HEADER_RC4_LOCL_H /* if this is defined data[i] is used instead of *data, this is a %20 * speedup on x86 */ -#define RC4_INDEX +#undef RC4_INDEX #endif #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) #define CONFIG_HEADER_BF_LOCL_H -#undef BF_PTR +#define BF_PTR #endif /* HEADER_BF_LOCL_H */ #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) @@ -221,7 +223,7 @@ extern "C" { /* Unroll the inner loop, this sometimes helps, sometimes hinders. * Very mucy CPU dependant */ #ifndef DES_UNROLL -#undef DES_UNROLL +#define DES_UNROLL #endif /* These default values were supplied by |
