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-md.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-md.h')
| -rw-r--r-- | src/sys-crypto-md.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sys-crypto-md.h b/src/sys-crypto-md.h index 34960cc3..80bc7aef 100644 --- a/src/sys-crypto-md.h +++ b/src/sys-crypto-md.h @@ -227,7 +227,7 @@ SHA256_Update(SHA256_CTX *ctx, const void *data, size_t length) } #endif -#elif defined(USE_WOLFSSL_CRYPTO) && !defined(USE_OPENSSL_CRYPTO) +#elif defined(USE_WOLFSSL_CRYPTO) /* WolfSSL compatibility API for OpenSSL unnecessarily bounces through an extra * layer of indirection. However, to avoid conflicting typedefs when includers @@ -236,6 +236,12 @@ SHA256_Update(SHA256_CTX *ctx, const void *data, size_t length) * (undef of OPENSSL_EXTRA and NO_OLD_WC_NAMES not sufficient, and not friendly * to do in a header when others might rely on them) */ +/* workaround fragile code in wolfssl/wolfcrypto/types.h */ +#if !defined(SIZEOF_LONG) || !defined(SIZEOF_LONG_LONG) +#undef SIZEOF_LONG +#undef SIZEOF_LONG_LONG +#endif + #ifndef NO_MD4 #include <wolfssl/wolfcrypt/md4.h> #include <wolfssl/openssl/md4.h> |