From 39c803cba216b91ff8233f6d5585468f8662d1c4 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Mon, 8 Feb 2016 23:19:31 -0500 Subject: 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 --- docs/THANKS | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/THANKS') diff --git a/docs/THANKS b/docs/THANKS index c8350897e..12e442fbd 100644 --- a/docs/THANKS +++ b/docs/THANKS @@ -457,6 +457,7 @@ Glen A Johnson Jr. Glen Nakamura Glen Scott Glenn Sheridan +Google Inc. Gordon Marler Gorilla Maguila Grant Erickson -- cgit v1.2.3