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

fix some problems with previous

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10490 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-08-13 15:12:16 +00:00
parent dd63466491
commit 2dbc6b6ddf
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/kadm5/set_keys.c
View File

@@ -183,17 +183,22 @@ make_keys(krb5_context context, krb5_principal principal, const char *password,
} }
strlwr(salt.saltvalue.data); strlwr(salt.saltvalue.data);
salt.saltvalue.length = strlen(*realm); salt.saltvalue.length = strlen(*realm);
salt_set = 1;
} }
} }
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
for(i = 0; i < num_etypes; i++) { for(i = 0; i < num_etypes; i++) {
Key *k; Key *k;
for(k = keys; k < keys + num_keyts; k++) { for(k = keys; k < keys + num_keys; k++) {
if(k->key.keytype == etypes[i] && if(k->key.keytype == etypes[i] &&
k->salt.salttype == salt.salttype && ((k->salt != NULL &&
k->salt.saltvalue.length == salt.saltvalue.length && k->salt->type == salt.salttype &&
memcmp(k->salt.saltvalue.data, salt.saltvalue.data, k->salt->salt.length == salt.saltvalue.length &&
salt.saltvalue.length) == 0) memcmp(k->salt->salt.data, salt.saltvalue.data,
salt.saltvalue.length) == 0) ||
(k->salt == NULL &&
salt.salttype == KRB5_PW_SALT &&
!salt_set)))
goto next_etype; goto next_etype;
} }