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

(read_master_encryptionkey): handle old keytype based files, and

Browse Source 
convert the key to cfb64


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8602 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-07-08 14:52:54 +00:00
parent f4db0f06de
commit 7ddae03f39
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/hdb/mkey.c
View File

@@ -203,8 +203,16 @@ read_master_encryptionkey(krb5_context context, const char *filename,
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if(ret) if(ret)
return ret; return ret;
/* Originally, the keytype was just that, and later it got changed
to des-cbc-md5, but we always used des in cfb64 mode. This
should cover all cases, but will break if someone has hacked
this code to really use des-cbc-md5 -- but then that's not my
problem. */
if(key.keytype == KEYTYPE_DES || key.keytype == ETYPE_DES_CBC_MD5)
key.keytype = ETYPE_DES_CFB64_NONE;
ret = hdb_process_master_key(context, 0, &key, ETYPE_DES_CFB64_NONE, mkey); ret = hdb_process_master_key(context, 0, &key, 0, mkey);
return ret; return ret;
} }