summaryrefslogtreecommitdiff
path: root/lib/curl_des.c
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2016-02-08 23:19:31 -0500
committerDaniel Stenberg <daniel@haxx.se>2016-02-09 08:46:36 +0100
commit39c803cba216b91ff8233f6d5585468f8662d1c4 (patch)
tree290082234a651c187e663cb68152f67377f0c2d8 /lib/curl_des.c
parent674b57e76b9daf544c9103655a8b92bdfcd08851 (diff)
downloadcurl-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_des.c')
-rw-r--r--lib/curl_des.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/curl_des.c b/lib/curl_des.c
index 3c7e529a7..421c9f768 100644
--- a/lib/curl_des.c
+++ b/lib/curl_des.c
@@ -22,7 +22,7 @@
#include "curl_setup.h"
-#if defined(USE_NTLM) && !defined(HAVE_DES_SET_ODD_PARITY)
+#if defined(USE_NTLM) && !defined(USE_OPENSSL)
#include "curl_des.h"
@@ -60,4 +60,4 @@ void Curl_des_set_odd_parity(unsigned char *bytes, size_t len)
}
}
-#endif /* USE_NTLM && !HAVE_DES_SET_ODD_PARITY */
+#endif /* USE_NTLM && !USE_OPENSSL */