Support for libradius

[mech_eap.orig] / util_shib.h

diff --git a/util_shib.h b/util_shib.h
index 8064aa7..91950de 100644 (file)
--- a/util_shib.h
+++ b/util_shib.h
@@ -33,15 +33,21 @@
 #ifndef _UTIL_SHIB_H_
 #define _UTIL_SHIB_H_ 1
 
+#ifdef __cplusplus
+
 #include <vector>
 
 namespace shibsp {
     class Attribute;
 };
 
+namespace shibresolver {
+    class ShibbolethResolver;
+};
+
 struct gss_eap_shib_attr_provider : gss_eap_attr_provider {
 public:
-    gss_eap_shib_attr_provider(void) {}
+    gss_eap_shib_attr_provider(void);
     ~gss_eap_shib_attr_provider(void);
 
     bool initFromExistingContext(const gss_eap_attr_ctx *source,
@@ -66,9 +72,9 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
-    void marshall(gss_buffer_t buffer) const;
-    bool unmarshall(const gss_eap_attr_ctx *ctx,
-                    const gss_buffer_t buffer);
+    void exportToBuffer(gss_buffer_t buffer) const;
+    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
+                        const gss_buffer_t buffer);
 
 
     static bool init();
@@ -77,14 +83,38 @@ public:
     static gss_eap_attr_provider *createAttrContext(void);
 
 private:
+    static shibsp::Attribute *
+        duplicateAttribute(const shibsp::Attribute *src);
+    static std::vector <shibsp::Attribute *>
+        duplicateAttributes(const std::vector <shibsp::Attribute *>src);
+
     int getAttributeIndex(const gss_buffer_t attr) const;
     const shibsp::Attribute *getAttribute(const gss_buffer_t attr) const;
 
-    const std::vector<shibsp::Attribute *> getAttributes(void) const {
+    std::vector<shibsp::Attribute *> getAttributes(void) const {
         return m_attributes;
     }
 
+    bool authenticated() const { return m_authenticated; }
+
+    friend bool
+    addRadiusAttribute(const gss_eap_attr_provider *source,
+                       const gss_buffer_t attribute,
+                       void *data);
+
     std::vector<shibsp::Attribute *> m_attributes;
+    int m_authenticated;
 };
 
+
+extern "C" {
+#endif
+
+OM_uint32 gssEapLocalAttrProviderInit(OM_uint32 *minor);
+OM_uint32 gssEapLocalAttrProviderFinalize(OM_uint32 *minor);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_SHIB_H_ */