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

add KEYTYPE_USE_AFS3_SALT to keytype if using AFS3 salt

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5150 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-09-15 15:02:24 +00:00
parent 12466a7560
commit 25b8ac84a1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/kadm5/set_keys.c
View File

@@ -62,10 +62,17 @@ _kadm5_set_keys(kadm5_server_context *context,
key->salt = NULL;
}
krb5_free_keyblock_contents(context->context, &key->key);
ret = krb5_string_to_key(password,
key->salt ? &key->salt->salt : &salt,
key->key.keytype,
&key->key);
{
krb5_keytype kt = key->key.keytype;
if(kt == KEYTYPE_DES &&
key->salt &&
key->salt->type == hdb_afs3_salt)
kt |= KEYTYPE_USE_AFS3_SALT;
ret = krb5_string_to_key(password,
key->salt ? &key->salt->salt : &salt,
kt,
&key->key);
}
if(ret)
break;
}