moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

ntlm_core: Use own odd parity function when crypto engine doesn't have one

Browse Source
This commit is contained in:
Steve Holme 2015-01-28 20:59:27 +00:00
parent c469369b86
commit 8cc70db2db
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/curl_ntlm_core.c
View File

@ -107,6 +107,7 @@
#include "curl_hmac.h" #include "curl_hmac.h"
#include "warnless.h" #include "warnless.h"
#include "curl_endian.h" #include "curl_endian.h"
#include "curl_des.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>
@ -147,7 +148,11 @@ 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)
Curl_des_set_odd_parity((unsigned char *) &key, sizeof(key));
#else
DES_set_odd_parity(&key); DES_set_odd_parity(&key);
#endif
/* Set the key */ /* Set the key */
DES_set_key(&key, ks); DES_set_key(&key, ks);
@ -163,6 +168,9 @@ static void setup_des_key(const unsigned char *key_56,
/* Expand the 56-bit key to 64-bits */ /* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, key); extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
Curl_des_set_odd_parity((unsigned char *) key, sizeof(key));
/* Set the key */ /* Set the key */
des_set_key(des, (const uint8_t *) key); des_set_key(des, (const uint8_t *) key);
} }
@ -180,6 +188,9 @@ static void setup_des_key(const unsigned char *key_56,
/* Expand the 56-bit key to 64-bits */ /* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, key); extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
Curl_des_set_odd_parity((unsigned char *) key, sizeof(key));
/* Set the key */ /* Set the key */
gcry_cipher_setkey(*des, key, sizeof(key)); gcry_cipher_setkey(*des, key, sizeof(key));
} }
@ -212,6 +223,9 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
/* Expand the 56-bit key to 64-bits */ /* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, key); extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
Curl_des_set_odd_parity((unsigned char *) key, sizeof(key));
/* Import the key */ /* Import the key */
key_item.data = (unsigned char *)key; key_item.data = (unsigned char *)key;
key_item.len = sizeof(key); key_item.len = sizeof(key);
@ -258,6 +272,9 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
/* Expand the 56-bit key to 64-bits */ /* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, key); extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
Curl_des_set_odd_parity((unsigned char *) key, sizeof(key));
/* Perform the encryption */ /* Perform the encryption */
err = CCCrypt(kCCEncrypt, kCCAlgorithmDES, kCCOptionECBMode, key, err = CCCrypt(kCCEncrypt, kCCAlgorithmDES, kCCOptionECBMode, key,
kCCKeySizeDES, NULL, in, 8 /* inbuflen */, out, kCCKeySizeDES, NULL, in, 8 /* inbuflen */, out,
@ -281,6 +298,9 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
/* Expand the 56-bit key to 64-bits */ /* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, ctl.Crypto_Key); extend_key_56_to_64(key_56, ctl.Crypto_Key);
/* Set the key parity to odd */
Curl_des_set_odd_parity((unsigned char *) ctl.Crypto_Key, ctl.Data_Len);
/* Perform the encryption */ /* Perform the encryption */
_CIPHER((_SPCPTR *) &out, &ctl, (_SPCPTR *) &in); _CIPHER((_SPCPTR *) &out, &ctl, (_SPCPTR *) &in);
@ -316,6 +336,9 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
/* Expand the 56-bit key to 64-bits */ /* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, blob.key); extend_key_56_to_64(key_56, blob.key);
/* Set the key parity to odd */
Curl_des_set_odd_parity((unsigned char *) blob.key, sizeof(blob.key));
/* Import the key */ /* Import the key */
if(!CryptImportKey(hprov, (BYTE *) &blob, sizeof(blob), 0, 0, &hkey)) { if(!CryptImportKey(hprov, (BYTE *) &blob, sizeof(blob), 0, 0, &hkey)) {
CryptReleaseContext(hprov, 0); CryptReleaseContext(hprov, 0);