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

stricter check that enctype matches checksum type when using keyed checksum

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24205 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-12-15 04:32:59 +00:00
parent 26abb7e637
commit 28de60a9bc
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/krb5/crypto.c
View File

@@ -1853,13 +1853,25 @@ verify_checksum(krb5_context context,
return KRB5KRB_AP_ERR_BAD_INTEGRITY; /* XXX */ return KRB5KRB_AP_ERR_BAD_INTEGRITY; /* XXX */
} }
keyed_checksum = (ct->flags & F_KEYED) != 0; keyed_checksum = (ct->flags & F_KEYED) != 0;
if(keyed_checksum && crypto == NULL) { if(keyed_checksum) {
struct checksum_type *kct;
if (crypto == NULL) {
krb5_set_error_message (context, KRB5_PROG_SUMTYPE_NOSUPP, krb5_set_error_message (context, KRB5_PROG_SUMTYPE_NOSUPP,
N_("Checksum type %s is keyed but no " N_("Checksum type %s is keyed but no "
"crypto context (key) was passed in", ""), "crypto context (key) was passed in", ""),
ct->name); ct->name);
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */ return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
} }
kct = crypto->et->keyed_checksum;
if (kct == NULL || kct->type != ct->type) {
krb5_set_error_message (context, KRB5_PROG_SUMTYPE_NOSUPP,
N_("Checksum type %s is keyed, but "
"the key type %s passed didnt have that checksum "
"type as the keyed type", ""),
ct->name, crypto->et->name);
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
}
}
if(keyed_checksum) { if(keyed_checksum) {
ret = get_checksum_key(context, crypto, usage, ct, &dkey); ret = get_checksum_key(context, crypto, usage, ct, &dkey);
if (ret) if (ret)