/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* SUCH DAMAGE.
*/
+/*
+ * General mechanism utility routines.
+ */
+
#include "gssapiP_eap.h"
/*
for (i = 0; i < mechs->count; i++) {
gss_OID oid = &mechs->elements[i];
- if (!gssEapIsConcreteMechanismOid(oid))
+ if (!gssEapIsConcreteMechanismOid(oid)) {
+ *minor = GSSEAP_WRONG_MECH;
return GSS_S_BAD_MECH;
+ }
}
return GSS_S_COMPLETE;
major = gss_create_empty_oid_set(minor, mechs);
if (GSS_ERROR(major)) {
- GSSEAP_FREE(etypes); /* XXX */
+ GSSEAP_FREE(etypes);
return major;
}
gss_release_oid(&tmpMinor, &mechOid);
}
- GSSEAP_FREE(etypes); /* XXX */
+ GSSEAP_FREE(etypes);
*minor = 0;
return major;
return 1;
}
+OM_uint32
+gssEapReleaseOid(OM_uint32 *minor, gss_OID *oid)
+{
+ gss_OID internalizedOid = GSS_C_NO_OID;
+
+ *minor = 0;
+
+ if (gssEapInternalizeOid(*oid, &internalizedOid)) {
+ /* OID was internalized, so we can mark it as "freed" */
+ *oid = GSS_C_NO_OID;
+ return GSS_S_COMPLETE;
+ }
+
+ /* we don't know about this OID */
+ return GSS_S_CONTINUE_NEEDED;
+}
+
static gss_buffer_desc gssEapSaslMechs[] = {
{ sizeof("EAP") - 1, "EAP", }, /* not used */
{ sizeof("EAP-AES128") - 1, "EAP-AES128" },