From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 22 Aug 2015 21:56:55 +0000 (+0200)
Subject: NTLM: recent boringssl brought DES_set_odd_parity back
X-Git-Tag: curl-7_45_0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=613e502;p=thirdparty%2Fcurl.git

NTLM: recent boringssl brought DES_set_odd_parity back

... so improve the #ifdefs for using our local implementation.
---

diff --git a/lib/curl_des.c b/lib/curl_des.c
index 42c1df9564..f90c2da603 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 2e5b573fd3..b72a8dc130 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);