Skip to content

Commit

Permalink
ntlm_core: Prefer sizeof(key) rather than hard coded sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
captain-caveman2k committed Jan 28, 2015
1 parent 58e39b4 commit c469369
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/curl_ntlm_core.c
Expand Up @@ -164,7 +164,7 @@ static void setup_des_key(const unsigned char *key_56,
extend_key_56_to_64(key_56, key);

/* Set the key */
des_set_key(des, (const uint8_t*)key);
des_set_key(des, (const uint8_t *) key);
}

#elif defined(USE_GNUTLS)
Expand All @@ -181,7 +181,7 @@ static void setup_des_key(const unsigned char *key_56,
extend_key_56_to_64(key_56, key);

/* Set the key */
gcry_cipher_setkey(*des, key, 8);
gcry_cipher_setkey(*des, key, sizeof(key));
}

#elif defined(USE_NSS)
Expand Down Expand Up @@ -214,7 +214,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,

/* Import the key */
key_item.data = (unsigned char *)key;
key_item.len = /* hard-wired */ 8;
key_item.len = sizeof(key);
symkey = PK11_ImportSymKey(slot, mech, PK11_OriginUnwrap, CKA_ENCRYPT,
&key_item, NULL);
if(!symkey)
Expand Down Expand Up @@ -276,7 +276,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,

/* Setup the cipher control structure */
ctl.Func_ID = ENCRYPT_ONLY;
ctl.Data_Len = 8;
ctl.Data_Len = sizeof(key);

/* Expand the 56-bit key to 64-bits */
extend_key_56_to_64(key_56, ctl.Crypto_Key);
Expand Down

0 comments on commit c469369

Please sign in to comment.