diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-29 16:42:55 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-29 16:42:55 -0400 |
| commit | 8187e988971725039364d685ab446bc11c859d40 (patch) | |
| tree | 895b7d3a86fde16875f1c401446eac85316232da /src/sys-crypto.h | |
| parent | 6fb63fa8d61bdacdc0041f954db860a66c1120a6 (diff) | |
| download | lighttpd-git-8187e988971725039364d685ab446bc11c859d40.tar.gz | |
[multiple] include wolfssl/options.h after select
include wolfssl/options.h crypto lib config
after selecting crypto lib to use
wolfSSL does not prefix its defines with a wolfSSL-specific namespace
(so we would like to avoid unnecessarily polluting preproc namespace)
This commit further isolates wolfSSL after split from mod_openssl.
Cleans up some preprocessor logic that was put in place when using
the wolfSSL compatibility layer for openssl, before creating a
dedicated mod_wolfssl.
Diffstat (limited to 'src/sys-crypto.h')
| -rw-r--r-- | src/sys-crypto.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/sys-crypto.h b/src/sys-crypto.h index 8fda44d0..a84047b4 100644 --- a/src/sys-crypto.h +++ b/src/sys-crypto.h @@ -7,34 +7,9 @@ #define USE_OPENSSL_CRYPTO #endif -#ifndef USE_OPENSSL_CRYPTO #ifdef HAVE_WOLFSSL_SSL_H #define USE_LIB_CRYPTO #define USE_WOLFSSL_CRYPTO -/* wolfSSL needs to be built with ./configure --enable-lighty for lighttpd. - * Doing so defines OPENSSL_EXTRA and HAVE_LIGHTY in <wolfssl/options.h>, and - * these defines are necessary for wolfSSL headers to expose sufficient openssl - * compatibility layer for wolfSSL to be able to provide an openssl substitute - * for use by lighttpd */ -#include <wolfssl/options.h> - -/* workaround fragile code in wolfssl/wolfcrypto/types.h */ -#ifdef __SIZEOF_LONG__ -#ifndef SIZEOF_LONG -#define SIZEOF_LONG __SIZEOF_LONG__ -#endif -#endif -#ifdef __SIZEOF_LONG_LONG__ -#ifndef SIZEOF_LONG_LONG -#define SIZEOF_LONG_LONG __SIZEOF_LONG_LONG__ -#endif -#endif -#if !defined(SIZEOF_LONG) || !defined(SIZEOF_LONG_LONG) -#undef SIZEOF_LONG -#undef SIZEOF_LONG_LONG -#endif - -#endif #endif #ifdef HAVE_LIBMBEDCRYPTO |