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

heimdal: added verbose logging of hemimdal crypto errors

Browse Source 
Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Andrew Bartlett
2010-09-30 20:13:34 -07:00
committed by Love Hornquist Astrand
parent c434086ba0
commit 7ea9ccf737
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/crypto.c
View File

@@ -1847,6 +1847,10 @@ verify_checksum(krb5_context context,
} }
if(ct->checksumsize != cksum->checksum.length) { if(ct->checksumsize != cksum->checksum.length) {
krb5_clear_error_message (context); krb5_clear_error_message (context);
krb5_set_error_message (context, KRB5KRB_AP_ERR_BAD_INTEGRITY,
N_("Decrypt integrity check failed for checksum type %s, length was %u, expected %u", ""),
ct->name, (unsigned)cksum->checksum.length, (unsigned)ct->checksumsize);
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;
@@ -1874,8 +1878,14 @@ verify_checksum(krb5_context context,
return ret; return ret;
} else } else
dkey = NULL; dkey = NULL;
if(ct->verify) if(ct->verify) {
return (*ct->verify)(context, dkey, data, len, usage, cksum); ret = (*ct->verify)(context, dkey, data, len, usage, cksum);
if (ret == KRB5KRB_AP_ERR_BAD_INTEGRITY) {
krb5_set_error_message (context, KRB5KRB_AP_ERR_BAD_INTEGRITY,
N_("Decrypt integrity check failed for checksum type %s, key type %s", ""),
ct->name, crypto->et->name);
}
}
ret = krb5_data_alloc (&c.checksum, ct->checksumsize); ret = krb5_data_alloc (&c.checksum, ct->checksumsize);
if (ret) if (ret)
@@ -1890,6 +1900,9 @@ verify_checksum(krb5_context context,
if(c.checksum.length != cksum->checksum.length || if(c.checksum.length != cksum->checksum.length ||
ct_memcmp(c.checksum.data, cksum->checksum.data, c.checksum.length)) { ct_memcmp(c.checksum.data, cksum->checksum.data, c.checksum.length)) {
krb5_clear_error_message (context); krb5_clear_error_message (context);
krb5_set_error_message (context, KRB5KRB_AP_ERR_BAD_INTEGRITY,
N_("Decrypt integrity check failed for checksum type %s, key type %s", ""),
ct->name, crypto->et->name);
ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; ret = KRB5KRB_AP_ERR_BAD_INTEGRITY;
} else { } else {
ret = 0; ret = 0;