X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil.h;h=dd0cb7354fc6fc84258e61f3058082ac348a4cc4;hb=1934e62da28e6068263ea3b10463169f7bcba461;hp=936ccea816840b36835b5d8eac1af2c847045a79;hpb=3e553b50567102fa23e35d6ca31d0d94d3edbebe;p=cyrus-sasl.git

diff --git a/mech_eap/util.h b/mech_eap/util.h
index 936ccea..dd0cb73 100644
--- a/mech_eap/util.h
+++ b/mech_eap/util.h
@@ -281,18 +281,6 @@ gssEapValidateMechs(OM_uint32 *minor,
                    const gss_OID_set mechs);
 
 /* util_name.c */
-enum gss_eap_attribute_type {
-    ATTR_TYPE_NONE                  = 0,
-    ATTR_TYPE_SAML_AAA_ASSERTION    = 1,
-    ATTR_TYPE_SAML_ATTR             = 2,
-    ATTR_TYPE_RADIUS_AVP            = 3
-};
-
-typedef OM_uint32 (*gss_eap_add_attr_cb)(OM_uint32 *minor,
-                                         gss_name_t name,
-                                         gss_buffer_t attribute,
-                                         void *data);
-
 OM_uint32 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName);
 OM_uint32 gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName);
 OM_uint32 gssEapExportName(OM_uint32 *minor,
@@ -304,21 +292,6 @@ OM_uint32 gssEapImportName(OM_uint32 *minor,
                            gss_OID input_name_type,
                            gss_name_t *output_name);
 
-enum gss_eap_attribute_type
-gssEapAttributePrefixToType(const gss_buffer_t prefix);
-gss_buffer_t
-gssEapAttributeTypeToPrefix(enum gss_eap_attribute_type type);
-OM_uint32
-decomposeAttributeName(OM_uint32 *minor,
-                       const gss_buffer_t attribute,
-                       gss_buffer_t prefix,
-                       gss_buffer_t suffix);
-OM_uint32
-composeAttributeName(OM_uint32 *minor,
-                     const gss_buffer_t prefix,
-                     const gss_buffer_t suffix,
-                     gss_buffer_t attribute);
-
 /* util_oid.c */
 OM_uint32
 composeOid(OM_uint32 *minor_status,
@@ -431,9 +404,6 @@ verifyTokenHeader(OM_uint32 *minor,
 #define GSSEAP_ONCE(o, i)               pthread_once((o), (i))
 #define GSSEAP_ONCE_INITIALIZER         PTHREAD_ONCE_INIT
 
-#include "util_radius.h"
-#include "util_saml.h"
-
 /* Helper functions */
 static inline void
 store_uint16_be(uint16_t val, void *vp)
@@ -549,4 +519,6 @@ store_oid(gss_OID oid, void *vp)
 }
 #endif
 
+#include "util_attr.h"
+
 #endif /* _UTIL_H_ */