cleanup, various

diff --git a/mech_eap/TODO b/mech_eap/TODO
index 781c029..c3a0e92 100644 (file)
--- a/mech_eap/TODO
+++ b/mech_eap/TODO
@@ -1,4 +1,4 @@
 - hook up SAML library
-- hook up RADIUS
-- export/import sec context
-- export/import composite (with attrs) name
+- hook up libradsec, AVP parsing logic
+- better handling of mechanism-specific error namespace
+- better interfaces for initiator EAP configuration/credential management

diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c
index 180b734..6208341 100644 (file)
--- a/mech_eap/accept_sec_context.c
+++ b/mech_eap/accept_sec_context.c
@@ -370,15 +370,8 @@ eapGssSmAcceptGssChannelBindings(OM_uint32 *minor,
     iov[0].buffer.length = 0;
     iov[0].buffer.value = NULL;
 
-#if 0
-    major = gssEapEncodeGssChannelBindings(minor, chanBindings,
-                                            &iov[0].buffer);
-    if (GSS_ERROR(major))
-        return major;
-#else
     if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
         iov[0].buffer = chanBindings->application_data;
-#endif
 
     iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER;
     iov[1].buffer.length = 16;

diff --git a/mech_eap/import_sec_context.c b/mech_eap/import_sec_context.c
index 968de8f..a64a618 100644 (file)
--- a/mech_eap/import_sec_context.c
+++ b/mech_eap/import_sec_context.c
@@ -34,9 +34,9 @@
 
 static OM_uint32
 gssEapImportPartialContext(OM_uint32 *minor,
-                          unsigned char **pBuf,
-                          size_t *pRemain,
-                          gss_ctx_id_t ctx)
+                           unsigned char **pBuf,
+                           size_t *pRemain,
+                           gss_ctx_id_t ctx)
 {
     unsigned char *p = *pBuf;
     size_t remain = *pRemain;

diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 578f923..67bc962 100644 (file)
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -452,17 +452,8 @@ eapGssSmInitGssChannelBindings(OM_uint32 *minor,
     iov[1].buffer.length = 0;
     iov[1].buffer.value = NULL;
 
-#if 0
-    major = gssEapEncodeGssChannelBindings(minor, chanBindings,
-                                            &iov[0].buffer);
-    if (GSS_ERROR(major))
-        goto cleanup;
-
-    iov[0].type |= GSS_IOV_BUFFER_FLAG_ALLOCATED;
-#else
     if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
         iov[0].buffer = chanBindings->application_data;
-#endif
 
     major = gssEapWrapOrGetMIC(minor, ctx, FALSE, FALSE, iov, 2,
                                TOK_TYPE_GSS_CB);

diff --git a/mech_eap/util.h b/mech_eap/util.h
index 1dafd6b..6f420d2 100644 (file)
--- a/mech_eap/util.h
+++ b/mech_eap/util.h
@@ -121,10 +121,12 @@ gssEapVerify(krb5_context context,
              int iov_count,
              int *valid);
 
+#if 0
 OM_uint32
 gssEapEncodeGssChannelBindings(OM_uint32 *minor,
                                gss_channel_bindings_t chanBindings,
                                gss_buffer_t encodedBindings);
+#endif
 
 /* util_context.c */
 OM_uint32 gssEapAllocContext(OM_uint32 *minor, gss_ctx_id_t *pCtx);