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

This should be the final fix for enctype 0 issues (tested)

Browse Source 
But how to build an MIT KDB with enctype 0 keys for testing in
    Heimdal?  Hmmm...
This commit is contained in:
Nicolas Williams
2011-10-06 00:55:54 -05:00
parent e15cabe10a
commit 1b03abb250
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/hdb/hdb-mitdb.c
View File

@@ -237,8 +237,8 @@ mdb_keyvalue2key(krb5_context context, hdb_entry *entry, krb5_storage *sp, uint1
* the key given its enctype, so we ignore this * the key given its enctype, so we ignore this
* 16-bit length-of-plaintext-key field. * 16-bit length-of-plaintext-key field.
*/ */
if (u16 > 2) {
krb5_storage_seek(sp, 2, SEEK_CUR); /* skip real length */ krb5_storage_seek(sp, 2, SEEK_CUR); /* skip real length */
if (u16 >= 2) {
k->key.keyvalue.length = u16 - 2; /* adjust cipher len */ k->key.keyvalue.length = u16 - 2; /* adjust cipher len */
k->key.keyvalue.data = malloc(k->key.keyvalue.length); k->key.keyvalue.data = malloc(k->key.keyvalue.length);
krb5_storage_read(sp, k->key.keyvalue.data, krb5_storage_read(sp, k->key.keyvalue.data,
@@ -246,7 +246,8 @@ mdb_keyvalue2key(krb5_context context, hdb_entry *entry, krb5_storage *sp, uint1
} else { } else {
/* We'll ignore this key; see our caller */ /* We'll ignore this key; see our caller */
k->key.keyvalue.length = 0; k->key.keyvalue.length = 0;
krb5_storage_seek(sp, u16, SEEK_CUR); k->key.keyvalue.data = NULL;
krb5_storage_seek(sp, u16, SEEK_CUR); /* skip real length */
} }
} else if (i == 1) { } else if (i == 1) {
/* This "version" means we have a salt */ /* This "version" means we have a salt */