generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NTLM: recent boringssl brought DES_set_odd_parity back

Browse Source 
... so improve the #ifdefs for using our local implementation.
This commit is contained in:
Daniel Stenberg
2015-08-22 23:56:55 +02:00
parent 2c12ac8de2
commit 613e5022fe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/curl_des.c
View File

@@ -22,7 +22,7 @@
#include "curl_setup.h" #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" #include "curl_des.h"

2
lib/curl_ntlm_core.c
View File

@@ -146,7 +146,7 @@ static void setup_des_key(const unsigned char *key_56,
extend_key_56_to_64(key_56, (char *) key); extend_key_56_to_64(key_56, (char *) key);
/* Set the key parity to odd */ /* 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)); Curl_des_set_odd_parity((unsigned char *) &key, sizeof(key));
#else #else
DES_set_odd_parity(&key); DES_set_odd_parity(&key);