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

indent, return error code

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-10-02 11:59:53 -07:00
parent 7ea9ccf737
commit 0789271ebb
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/krb5/crypto.c
View File

@@ -1847,9 +1847,11 @@ 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, krb5_set_error_message(context, KRB5KRB_AP_ERR_BAD_INTEGRITY,
N_("Decrypt integrity check failed for checksum type %s, length was %u, expected %u", ""), N_("Decrypt integrity check failed for checksum type %s, "
ct->name, (unsigned)cksum->checksum.length, (unsigned)ct->checksumsize); "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 */
} }
@@ -1857,18 +1859,18 @@ verify_checksum(krb5_context context,
if(keyed_checksum) { if(keyed_checksum) {
struct checksum_type *kct; struct checksum_type *kct;
if (crypto == NULL) { 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; kct = crypto->et->keyed_checksum;
if (kct != NULL && kct->type != ct->type) { if (kct != NULL && kct->type != ct->type) {
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 " N_("Checksum type %s is keyed, but "
"the key type %s passed didnt have that checksum " "the key type %s passed didnt have that checksum "
"type as the keyed type", ""), "type as the keyed type", ""),
ct->name, crypto->et->name); ct->name, crypto->et->name);
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */ return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
} }
@@ -1880,11 +1882,11 @@ verify_checksum(krb5_context context,
dkey = NULL; dkey = NULL;
if(ct->verify) { if(ct->verify) {
ret = (*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, ret,
krb5_set_error_message (context, KRB5KRB_AP_ERR_BAD_INTEGRITY, N_("Decrypt integrity check failed for checksum "
N_("Decrypt integrity check failed for checksum type %s, key type %s", ""), "type %s, key type %s", ""),
ct->name, crypto->et->name); ct->name, crypto->et->name);
} return ret;
} }
ret = krb5_data_alloc (&c.checksum, ct->checksumsize); ret = krb5_data_alloc (&c.checksum, ct->checksumsize);
@@ -1900,10 +1902,11 @@ 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;
krb5_set_error_message(context, ret,
N_("Decrypt integrity check failed for checksum "
"type %s, key type %s", ""),
ct->name, crypto->et->name);
} else { } else {
ret = 0; ret = 0;
} }