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

Fix a couple of bugs in krb5_c_valid_enctype():

Browse Source 
1.  on errors, it appears to core dump, and

      2.  the sense of the return code is inverted from the
          MIT implementation.

Signed-off-by: Love Hörnquist Åstrand <lha@h5l.org>
This commit is contained in:
Roland C. Dowdeswell
2011-07-19 10:38:18 +01:00
committed by Love Hörnquist Åstrand
parent 7aaba443bc
commit 3ef06de67b
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/krb5/crypto.c
View File

@@ -698,19 +698,21 @@ krb5_enctype_valid(krb5_context context,
krb5_enctype etype) krb5_enctype etype)
{ {
struct _krb5_encryption_type *e = _krb5_find_enctype(etype); struct _krb5_encryption_type *e = _krb5_find_enctype(etype);
if(e != NULL && !(e->flags & F_DISABLED))
return 0;
if (!context)
return KRB5_PROG_ETYPE_NOSUPP;
if(e == NULL) { if(e == NULL) {
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP,
N_("encryption type %d not supported", ""), N_("encryption type %d not supported", ""),
etype); etype);
return KRB5_PROG_ETYPE_NOSUPP; return KRB5_PROG_ETYPE_NOSUPP;
} }
if (e->flags & F_DISABLED) { /* Must be (e->flags & F_DISABLED) */
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP,
N_("encryption type %s is disabled", ""), N_("encryption type %s is disabled", ""),
e->name); e->name);
return KRB5_PROG_ETYPE_NOSUPP; return KRB5_PROG_ETYPE_NOSUPP;
}
return 0;
} }
/** /**

2
lib/krb5/mit_glue.c
View File

@@ -139,7 +139,7 @@ krb5_checksum_free(krb5_context context, krb5_checksum *cksum)
KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
krb5_c_valid_enctype (krb5_enctype etype) krb5_c_valid_enctype (krb5_enctype etype)
{ {
return krb5_enctype_valid(NULL, etype); return !krb5_enctype_valid(NULL, etype);
} }
KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL