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

(v4_get_masterkey): check kdb_verify_master_key properly

Browse Source 
(kdb_prop): decrypt key properly


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9629 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-02-05 03:40:00 +00:00
parent d2ae43cdc4
commit 9451280638
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kdc/hprop.c
View File

@@ -159,8 +159,8 @@ kdb_prop(void *arg, Principal *p)
strlcpy(pr.name, p->name, sizeof(pr.name)); strlcpy(pr.name, p->name, sizeof(pr.name));
strlcpy(pr.instance, p->instance, sizeof(pr.instance)); strlcpy(pr.instance, p->instance, sizeof(pr.instance));
copy_to_key(&p->key_low, &p->key_high, pr.key);
kdb_encrypt_key(&pr.key, &pr.key, &mkey4, msched4, DES_DECRYPT); kdb_encrypt_key(&pr.key, &pr.key, &mkey4, msched4, DES_DECRYPT);
copy_from_key(pr.key, &p->key_low, &p->key_high);
pr.exp_date = p->exp_date; pr.exp_date = p->exp_date;
pr.mod_date = p->mod_date; pr.mod_date = p->mod_date;
strlcpy(pr.mod_name, p->mod_name, sizeof(pr.mod_name)); strlcpy(pr.mod_name, p->mod_name, sizeof(pr.mod_name));
@@ -769,10 +769,9 @@ v4_get_masterkey (krb5_context context, char *database)
if(e) if(e)
krb5_errx(context, 1, "kdb_get_master_key: %s", krb5_errx(context, 1, "kdb_get_master_key: %s",
krb_get_err_text(e)); krb_get_err_text(e));
e = kdb_verify_master_key(&mkey4, msched4, stdout); e = kdb_verify_master_key(&mkey4, msched4, NULL);
if (e) if (e < 0)
krb5_errx(context, 1, "kdb_verify_master_key: %s", krb5_errx(context, 1, "kdb_verify_master_key failed");
krb_get_err_text(e));
} }
#endif #endif