Remove hard-coded openssl config
This commit is contained in:
parent
a6e8cd7892
commit
412f2cb2ba
|
@ -5,8 +5,8 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
/* OpenSSL was configured with the following options: */
|
/* OpenSSL was configured with the following options: */
|
||||||
#ifndef OPENSSL_SYSNAME_WIN32
|
#ifndef OPENSSL_SYSNAME_MACOSX
|
||||||
# define OPENSSL_SYSNAME_WIN32
|
//# define OPENSSL_SYSNAME_MACOSX
|
||||||
#endif
|
#endif
|
||||||
#ifndef OPENSSL_DOING_MAKEDEPEND
|
#ifndef OPENSSL_DOING_MAKEDEPEND
|
||||||
|
|
||||||
|
@ -59,6 +59,9 @@ extern "C" {
|
||||||
#ifndef OPENSSL_THREADS
|
#ifndef OPENSSL_THREADS
|
||||||
# define OPENSSL_THREADS
|
# define OPENSSL_THREADS
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
|
||||||
|
# define OPENSSL_NO_DYNAMIC_ENGINE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
|
/* 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
|
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(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
||||||
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
||||||
#define ENGINESDIR "T:\\Build-OpenSSL-VC32-Release-DLL/lib/engines"
|
#define ENGINESDIR "/tmp/openssl-1.0.2h-i386/lib/engines"
|
||||||
#define OPENSSLDIR "T:\\Build-OpenSSL-VC32-Release-DLL/ssl"
|
#define OPENSSLDIR "/tmp/openssl-1.0.2h-i386"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -127,7 +130,6 @@ extern "C" {
|
||||||
#define OPENSSL_UNISTD <unistd.h>
|
#define OPENSSL_UNISTD <unistd.h>
|
||||||
|
|
||||||
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
|
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
|
||||||
#define OPENSSL_EXPORT_VAR_AS_FUNCTION
|
|
||||||
|
|
||||||
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
|
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
|
||||||
#define IDEA_INT unsigned int
|
#define IDEA_INT unsigned int
|
||||||
|
@ -158,7 +160,7 @@ extern "C" {
|
||||||
* This enables code handling data aligned at natural CPU word
|
* This enables code handling data aligned at natural CPU word
|
||||||
* boundary. See crypto/rc4/rc4_enc.c for further details.
|
* boundary. See crypto/rc4/rc4_enc.c for further details.
|
||||||
*/
|
*/
|
||||||
#undef RC4_CHUNK
|
#define RC4_CHUNK unsigned long
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -186,12 +188,12 @@ extern "C" {
|
||||||
#define CONFIG_HEADER_RC4_LOCL_H
|
#define CONFIG_HEADER_RC4_LOCL_H
|
||||||
/* if this is defined data[i] is used instead of *data, this is a %20
|
/* if this is defined data[i] is used instead of *data, this is a %20
|
||||||
* speedup on x86 */
|
* speedup on x86 */
|
||||||
#define RC4_INDEX
|
#undef RC4_INDEX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
|
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
|
||||||
#define CONFIG_HEADER_BF_LOCL_H
|
#define CONFIG_HEADER_BF_LOCL_H
|
||||||
#undef BF_PTR
|
#define BF_PTR
|
||||||
#endif /* HEADER_BF_LOCL_H */
|
#endif /* HEADER_BF_LOCL_H */
|
||||||
|
|
||||||
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_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.
|
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
|
||||||
* Very mucy CPU dependant */
|
* Very mucy CPU dependant */
|
||||||
#ifndef DES_UNROLL
|
#ifndef DES_UNROLL
|
||||||
#undef DES_UNROLL
|
#define DES_UNROLL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* These default values were supplied by
|
/* These default values were supplied by
|
||||||
|
|
Loading…
Reference in New Issue