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

gss: error out in test_context if unknown OID

Browse Source 
Fix regression in previous commit: exit with an error if test_context is called
with an unknown mechanism type.
This commit is contained in:
Luke Howard
2021-08-08 13:45:03 +10:00
parent 18c18d84b1
commit 3b1f9f0a3f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/gssapi/test_context.c
View File

@@ -87,6 +87,17 @@ static char *a_channel_bindings = NULL;
static krb5_context context;
static krb5_enctype limit_enctype = 0;
static gss_OID
string_to_oid(const char *name)
{
gss_OID oid = gss_name_to_oid(name);
if (oid == GSS_C_NO_OID)
errx(1, "name '%s' not known", name);
return oid;
}
static void
string_to_oids(gss_OID_set *oidsetp, char *names)
{
@@ -113,10 +124,7 @@ string_to_oids(gss_OID_set *oidsetp, char *names)
for (name = strtok_r(names, ", ", &s);
name != NULL;
name = strtok_r(NULL, ", ", &s)) {
gss_OID oid = gss_name_to_oid(name);
if (oid == GSS_C_NO_OID)
errx(1, "gss_name_to_oid: unknown mech %s", name);
gss_OID oid = string_to_oid(name);
maj_stat = gss_add_oid_set_member(&min_stat, oid, oidsetp);
if (GSS_ERROR(maj_stat))
@@ -814,7 +822,7 @@ main(int argc, char **argv)
if (mech_string == NULL)
mechoid = GSS_KRB5_MECHANISM;
else
mechoid = gss_name_to_oid(mech_string);
mechoid = string_to_oid(mech_string);
if (mechs_string == NULL) {
/*
@@ -998,7 +1006,7 @@ main(int argc, char **argv)
if (ret_mech_string) {
gss_OID retoid;
retoid = gss_name_to_oid(ret_mech_string);
retoid = string_to_oid(ret_mech_string);
if (gss_oid_equal(retoid, actual_mech) == 0)
errx(1, "actual_mech mech is not the expected type %s",