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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3b4139328..7af4a80a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1631,8 +1631,6 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then dnl Older versions of Cyassl (some time before 2.9.4) don't have dnl SSL_get_shutdown (but this check won't actually detect it there dnl as it's a macro that needs the header files be included) - dnl BoringSSL didn't have DES_set_odd_parity for a while but now it is - dnl back again. AC_CHECK_FUNCS( RAND_status \ RAND_screen \ @@ -1640,8 +1638,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then ENGINE_cleanup \ CRYPTO_cleanup_all_ex_data \ SSL_get_shutdown \ - SSLv2_client_method \ - DES_set_odd_parity ) + SSLv2_client_method ) AC_MSG_CHECKING([for BoringSSL]) AC_COMPILE_IFELSE([ |