Commit 1cb17b2a authored by Steve Holme's avatar Steve Holme
Browse files

ntlm: Use extend_key_56_to_64() for all cryptography engines 

Rather than duplicate the code in setup_des_key() for OpenSSL and in
extend_key_56_to_64() for non-OpenSSL based crypto engines, as it is
the same, use extend_key_56_to_64() for all engines.
parent 1dd57bd7

lib/curl_ntlm_core.c

+14 −26
Original line number Diff line number Diff line
@@ -118,16 +118,11 @@ 
#define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00"

#define NTLMv2_BLOB_LEN       (44 -16 + ntlm->target_info_len + 4)



#ifdef USE_SSLEAY

/*

 * Turns a 56 bit key into the 64 bit, odd parity key and sets the key.  The

 * key schedule ks is also set.

* Turns a 56-bit key into being 64-bit wide.

*/

static void setup_des_key(const unsigned char *key_56,

                          DES_key_schedule DESKEYARG(ks))

static void extend_key_56_to_64(const unsigned char *key_56, char *key)

{

  DES_cblock key;



  key[0] = key_56[0];

  key[1] = (unsigned char)(((key_56[0] << 7) & 0xFF) | (key_56[1] >> 1));

  key[2] = (unsigned char)(((key_56[1] << 6) & 0xFF) | (key_56[2] >> 2));
@@ -136,29 +131,24 @@ static void setup_des_key(const unsigned char *key_56, 
  key[5] = (unsigned char)(((key_56[4] << 3) & 0xFF) | (key_56[5] >> 5));

  key[6] = (unsigned char)(((key_56[5] << 2) & 0xFF) | (key_56[6] >> 6));

  key[7] = (unsigned char) ((key_56[6] << 1) & 0xFF);



  DES_set_odd_parity(&key);

  DES_set_key(&key, ks);

}



#else /* defined(USE_SSLEAY) */



#ifdef USE_SSLEAY

/*

 * Turns a 56 bit key into the 64 bit, odd parity key.  Used by GnuTLS and NSS.

 * Turns a 56 bit key into the 64 bit, odd parity key and sets the key.  The

 * key schedule ks is also set.

 */

static void extend_key_56_to_64(const unsigned char *key_56, char *key)

static void setup_des_key(const unsigned char *key_56,

                          DES_key_schedule DESKEYARG(ks))

{

  key[0] = key_56[0];

  key[1] = (unsigned char)(((key_56[0] << 7) & 0xFF) | (key_56[1] >> 1));

  key[2] = (unsigned char)(((key_56[1] << 6) & 0xFF) | (key_56[2] >> 2));

  key[3] = (unsigned char)(((key_56[2] << 5) & 0xFF) | (key_56[3] >> 3));

  key[4] = (unsigned char)(((key_56[3] << 4) & 0xFF) | (key_56[4] >> 4));

  key[5] = (unsigned char)(((key_56[4] << 3) & 0xFF) | (key_56[5] >> 5));

  key[6] = (unsigned char)(((key_56[5] << 2) & 0xFF) | (key_56[6] >> 6));

  key[7] = (unsigned char) ((key_56[6] << 1) & 0xFF);

  DES_cblock key;



  extend_key_56_to_64(key_56, key);

  DES_set_odd_parity(&key);

  DES_set_key(&key, ks);

}



#if defined(USE_GNUTLS_NETTLE)

#elif defined(USE_GNUTLS_NETTLE)



static void setup_des_key(const unsigned char *key_56,

                          struct des_ctx *des)
@@ -318,8 +308,6 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out, 


#endif /* defined(USE_WIN32_CRYPTO) */



#endif /* defined(USE_SSLEAY) */



 /*

  * takes a 21 byte array and treats it as 3 56-bit DES keys. The

  * 8 byte plaintext is encrypted with each key and the resulting 24