* SUCH DAMAGE.
*/
+/*
+ * General mechanism utility routines.
+ */
+
#include "gssapiP_eap.h"
/*
* 1.3.6.1.4.1.5322(padl)
- * gssEap(21)
+ * gssEap(22)
* mechanisms(1)
* eap-aes128-cts-hmac-sha1-96(17)
* eap-aes256-cts-hmac-sha1-96(18)
* gss_inquire_name.)
*/
static gss_OID_desc gssEapMechOids[] = {
- /* 1.3.6.1.4.1.5322.21.1 */
- { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01" },
- /* 1.3.6.1.4.1.5322.21.1.17 */
- { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x11" },
- /* 1.3.6.1.4.1.5322.21.1.18 */
- { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x12" }
+ /* 1.3.6.1.4.1.5322.22.1 */
+ { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01" },
+ /* 1.3.6.1.4.1.5322.22.1.17 */
+ { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x11" },
+ /* 1.3.6.1.4.1.5322.22.1.18 */
+ { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x12" }
};
gss_OID GSS_EAP_MECHANISM = &gssEapMechOids[0];
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;