diff options
| author | David Benjamin <davidben@google.com> | 2016-02-08 23:19:31 -0500 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-02-09 08:46:36 +0100 |
| commit | 39c803cba216b91ff8233f6d5585468f8662d1c4 (patch) | |
| tree | 290082234a651c187e663cb68152f67377f0c2d8 /lib/curl_setup.h | |
| parent | 674b57e76b9daf544c9103655a8b92bdfcd08851 (diff) | |
| download | curl-39c803cba216b91ff8233f6d5585468f8662d1c4.tar.gz | |
openssl: remove most BoringSSL #ifdefs.
As of https://boringssl-review.googlesource.com/#/c/6980/, almost all of
BoringSSL #ifdefs in cURL should be unnecessary:
- BoringSSL provides no-op stubs for compatibility which replaces most
#ifdefs.
- DES_set_odd_parity has been in BoringSSL for nearly a year now. Remove
the compatibility codepath.
- With a small tweak to an extend_key_56_to_64 call, the NTLM code
builds fine.
- Switch OCSP-related #ifdefs to the more generally useful
OPENSSL_NO_OCSP.
The only #ifdefs which remain are Curl_ossl_version and the #undefs to
work around OpenSSL and wincrypt.h name conflicts. (BoringSSL leaves
that to the consumer. The in-header workaround makes things sensitive to
include order.)
This change errs on the side of removing conditionals despite many of
the restored codepaths being no-ops. (BoringSSL generally adds no-op
compatibility stubs when possible. OPENSSL_VERSION_NUMBER #ifdefs are
bad enough!)
Closes #640
Diffstat (limited to 'lib/curl_setup.h')
| -rw-r--r-- | lib/curl_setup.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 33ad12919..516327345 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -628,13 +628,9 @@ int netware_init(void); defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \ defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) -#ifdef HAVE_BORINGSSL /* BoringSSL is not NTLM capable */ -#undef USE_NTLM -#else #define USE_NTLM #endif #endif -#endif /* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */ #if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE) |