oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Use DES_set_key_unchecked().

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23142 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-04-29 05:47:08 +00:00
parent 38153d7b7a
commit af065bb9b8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/krb5/crypto.c
View File

@@ -179,7 +179,7 @@ static void
krb5_DES_schedule(krb5_context context, krb5_DES_schedule(krb5_context context,
struct key_data *key) struct key_data *key)
{ {
DES_set_key(key->key->keyvalue.data, key->schedule->data); DES_set_key_unchecked(key->key->keyvalue.data, key->schedule->data);
} }
#ifdef ENABLE_AFS_STRING_TO_KEY #ifdef ENABLE_AFS_STRING_TO_KEY
@@ -246,12 +246,12 @@ krb5_DES_AFS3_Transarc_string_to_key (krb5_data pw,
memcpy(&ivec, "kerberos", 8); memcpy(&ivec, "kerberos", 8);
memcpy(&temp_key, "kerberos", 8); memcpy(&temp_key, "kerberos", 8);
DES_set_odd_parity (&temp_key); DES_set_odd_parity (&temp_key);
DES_set_key (&temp_key, &schedule); DES_set_key_unchecked (&temp_key, &schedule);
DES_cbc_cksum ((void*)password, &ivec, passlen, &schedule, &ivec); DES_cbc_cksum ((void*)password, &ivec, passlen, &schedule, &ivec);
memcpy(&temp_key, &ivec, 8); memcpy(&temp_key, &ivec, 8);
DES_set_odd_parity (&temp_key); DES_set_odd_parity (&temp_key);
DES_set_key (&temp_key, &schedule); DES_set_key_unchecked (&temp_key, &schedule);
DES_cbc_cksum ((void*)password, key, passlen, &schedule, &ivec); DES_cbc_cksum ((void*)password, key, passlen, &schedule, &ivec);
memset(&schedule, 0, sizeof(schedule)); memset(&schedule, 0, sizeof(schedule));
memset(&temp_key, 0, sizeof(temp_key)); memset(&temp_key, 0, sizeof(temp_key));
@@ -306,7 +306,7 @@ DES_string_to_key_int(unsigned char *data, size_t length, DES_cblock *key)
DES_set_odd_parity(key); DES_set_odd_parity(key);
if(DES_is_weak_key(key)) if(DES_is_weak_key(key))
(*key)[7] ^= 0xF0; (*key)[7] ^= 0xF0;
DES_set_key(key, &schedule); DES_set_key_unchecked(key, &schedule);
DES_cbc_cksum((void*)data, key, length, &schedule, key); DES_cbc_cksum((void*)data, key, length, &schedule, key);
memset(&schedule, 0, sizeof(schedule)); memset(&schedule, 0, sizeof(schedule));
DES_set_odd_parity(key); DES_set_odd_parity(key);
@@ -391,9 +391,9 @@ DES3_schedule(krb5_context context,
{ {
DES_cblock *k = key->key->keyvalue.data; DES_cblock *k = key->key->keyvalue.data;
DES_key_schedule *s = key->schedule->data; DES_key_schedule *s = key->schedule->data;
DES_set_key(&k[0], &s[0]); DES_set_key_unchecked(&k[0], &s[0]);
DES_set_key(&k[1], &s[1]); DES_set_key_unchecked(&k[1], &s[1]);
DES_set_key(&k[2], &s[2]); DES_set_key_unchecked(&k[2], &s[2]);
} }
/* /*
@@ -454,7 +454,7 @@ DES3_string_to_key(krb5_context context,
DES_set_odd_parity(keys + i); DES_set_odd_parity(keys + i);
if(DES_is_weak_key(keys + i)) if(DES_is_weak_key(keys + i))
xor(keys + i, (const unsigned char*)"\0\0\0\0\0\0\0\xf0"); xor(keys + i, (const unsigned char*)"\0\0\0\0\0\0\0\xf0");
DES_set_key(keys + i, &s[i]); DES_set_key_unchecked(keys + i, &s[i]);
} }
memset(&ivec, 0, sizeof(ivec)); memset(&ivec, 0, sizeof(ivec));
DES_ede3_cbc_encrypt(tmp, DES_ede3_cbc_encrypt(tmp,