Catches both keyed checkout w/o crypto context cases and doesn't reset
the string, and corrects the grammar. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17514 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1957,9 +1957,8 @@ create_checksum (krb5_context context,
|
|||||||
keyed_checksum = (ct->flags & F_KEYED) != 0;
|
keyed_checksum = (ct->flags & F_KEYED) != 0;
|
||||||
if(keyed_checksum && crypto == NULL) {
|
if(keyed_checksum && crypto == NULL) {
|
||||||
krb5_set_error_string (context, "Checksum type %s is keyed "
|
krb5_set_error_string (context, "Checksum type %s is keyed "
|
||||||
"not no crypto context (key) was passed in",
|
"but no crypto context (key) was passed in",
|
||||||
ct->name);
|
ct->name);
|
||||||
krb5_clear_error_string (context);
|
|
||||||
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
|
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
|
||||||
}
|
}
|
||||||
if(keyed_checksum) {
|
if(keyed_checksum) {
|
||||||
@@ -2044,7 +2043,9 @@ verify_checksum(krb5_context context,
|
|||||||
}
|
}
|
||||||
keyed_checksum = (ct->flags & F_KEYED) != 0;
|
keyed_checksum = (ct->flags & F_KEYED) != 0;
|
||||||
if(keyed_checksum && crypto == NULL) {
|
if(keyed_checksum && crypto == NULL) {
|
||||||
krb5_clear_error_string (context);
|
krb5_set_error_string (context, "Checksum type %s is keyed "
|
||||||
|
"but no crypto context (key) was passed in",
|
||||||
|
ct->name);
|
||||||
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
|
return KRB5_PROG_SUMTYPE_NOSUPP; /* XXX */
|
||||||
}
|
}
|
||||||
if(keyed_checksum)
|
if(keyed_checksum)
|
||||||
|
Reference in New Issue
Block a user