diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-08-22 23:56:55 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-08-22 23:59:18 +0200 |
| commit | 613e5022fe24cb23922c5f32ef3c33c5fb36d115 (patch) | |
| tree | 5fc48f843d6e6f337559a78b3d255b51764a7824 | |
| parent | 2c12ac8de232366995a2777e6d638ab1bdb37c93 (diff) | |
| download | curl-613e5022fe24cb23922c5f32ef3c33c5fb36d115.tar.gz | |
NTLM: recent boringssl brought DES_set_odd_parity back
... so improve the #ifdefs for using our local implementation.
| -rw-r--r-- | lib/curl_des.c | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/curl_des.c b/lib/curl_des.c index 42c1df956..f90c2da60 100644 --- a/lib/curl_des.c +++ b/lib/curl_des.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#if defined(USE_NTLM) && (!defined(USE_OPENSSL) || defined(HAVE_BORINGSSL)) +#if defined(USE_NTLM) && !defined(HAVE_DES_SET_ODD_PARITY) #include "curl_des.h" diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index 2e5b573fd..b72a8dc13 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -146,7 +146,7 @@ static void setup_des_key(const unsigned char *key_56, extend_key_56_to_64(key_56, (char *) key); /* Set the key parity to odd */ -#if defined(HAVE_BORINGSSL) +#ifndef HAVE_DES_SET_ODD_PARITY /* older boringssl */ Curl_des_set_odd_parity((unsigned char *) &key, sizeof(key)); #else DES_set_odd_parity(&key); |