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

(read_master_mit): fix this

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8552 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-07-05 19:27:48 +00:00
parent bb90aecaee
commit 326dfb8181
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/hdb/mkey.c
View File

@@ -156,16 +156,22 @@ read_master_mit(krb5_context context, const char *filename,
return errno; return errno;
} }
krb5_storage_set_flags(sp, KRB5_STORAGE_HOST_BYTEORDER); krb5_storage_set_flags(sp, KRB5_STORAGE_HOST_BYTEORDER);
#if 0
/* could possibly use ret_keyblock here, but do it with more
checks for now */
ret = krb5_ret_keyblock(sp, &key);
#else
ret = krb5_ret_int16(sp, &enctype); ret = krb5_ret_int16(sp, &enctype);
if((htons(enctype) & 0xff00) == 0x3000) { if((htons(enctype) & 0xff00) == 0x3000) {
ret = HEIM_ERR_BAD_MKEY; ret = HEIM_ERR_BAD_MKEY;
goto out; goto out;
} }
ret = krb5_ret_keyblock(sp, &key); key.keytype = enctype;
if(enctype != 0x1ff /* ENCTYPE_UNKNOWN */ && enctype != key.keytype) ret = krb5_ret_data(sp, &key.keyvalue);
ret = HEIM_ERR_BAD_MKEY; if(ret)
else goto out;
ret = hdb_process_master_key(context, 0, &key, 0, mkey); #endif
ret = hdb_process_master_key(context, 0, &key, 0, mkey);
krb5_free_keyblock_contents(context, &key); krb5_free_keyblock_contents(context, &key);
out: out:
krb5_storage_free(sp); krb5_storage_free(sp);