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

(DES3_string_to_key): make this actually do what the draft said it

Browse Source 
should


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5401 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-02-20 16:30:11 +00:00
parent a4637a1462
commit 8f5094b857
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/krb5/crypto.c
View File

@@ -316,6 +316,7 @@ DES3_string_to_key(krb5_context context,
{ {
char *str; char *str;
size_t len; size_t len;
unsigned char tmp[24];
des_cblock keys[3]; des_cblock keys[3];
len = password.length + salt.saltvalue.length; len = password.length + salt.saltvalue.length;
@@ -329,24 +330,27 @@ DES3_string_to_key(krb5_context context,
des_key_schedule s[3]; des_key_schedule s[3];
int i; int i;
n_fold(str, len, keys, 24); n_fold(str, len, tmp, 24);
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
memcpy(keys + i, tmp + i * 8, sizeof(keys[i]));
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, (unsigned char*)"\0\0\0\0\0\0\0\xf0"); xor(keys + i, (unsigned char*)"\0\0\0\0\0\0\0\xf0");
des_set_key(keys + i, s[i]); des_set_key(keys + i, s[i]);
} }
memset(&ivec, 0, sizeof(ivec)); memset(&ivec, 0, sizeof(ivec));
des_ede3_cbc_encrypt(keys, keys, sizeof(keys), des_ede3_cbc_encrypt((void*)tmp, (void*)tmp, sizeof(tmp),
s[0], s[1], s[2], &ivec, DES_ENCRYPT); s[0], s[1], s[2], &ivec, DES_ENCRYPT);
memset(s, 0, sizeof(s)); memset(s, 0, sizeof(s));
memset(&ivec, 0, sizeof(ivec)); memset(&ivec, 0, sizeof(ivec));
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
memcpy(keys + i, tmp + i * 8, sizeof(keys[i]));
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, (unsigned char*)"\0\0\0\0\0\0\0\xf0"); xor(keys + i, (unsigned char*)"\0\0\0\0\0\0\0\xf0");
} }
memset(tmp, 0, sizeof(tmp));
} }
key->keytype = enctype; key->keytype = enctype;
krb5_data_copy(&key->keyvalue, keys, sizeof(keys)); krb5_data_copy(&key->keyvalue, keys, sizeof(keys));