cleanup, plugin attr context

[mech_eap.orig] / util_radius.h

diff --git a/util_radius.h b/util_radius.h
index 8d91a9c..bb9875d 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -33,9 +33,11 @@
 #ifndef _UTIL_RADIUS_H_
 #define _UTIL_RADIUS_H_ 1
 
+#ifdef __cplusplus
+
 struct gss_eap_radius_attr_provider : gss_eap_attr_provider {
 public:
-    gss_eap_radius_attr_provider(void) {}
+    gss_eap_radius_attr_provider(void);
     ~gss_eap_radius_attr_provider(void);
 
     bool initFromExistingContext(const gss_eap_attr_ctx *source,
@@ -60,9 +62,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);
 
     bool getAttribute(unsigned int attribute,
                       int *authenticated,
@@ -71,12 +73,42 @@ public:
                       gss_buffer_t display_value,
                       int *more) const;
 
+    bool authenticated() const { return m_authenticated; }
+
     static bool init();
     static void finalize();
 
     static gss_eap_attr_provider *createAttrContext(void);
 
 private:
+    bool m_authenticated;
 };
 
+/* For now */
+#define PW_SAML_ASSERTION           1936
+
+extern "C" {
+#endif
+
+OM_uint32
+addAvpFromBuffer(OM_uint32 *minor,
+                 rc_handle *rh,
+                 VALUE_PAIR **vp,
+                 int type,
+                 gss_buffer_t buffer);
+
+OM_uint32
+getBufferFromAvps(OM_uint32 *minor,
+                  VALUE_PAIR *vps,
+                  int type,
+                  gss_buffer_t buffer,
+                  int concat);
+
+OM_uint32 gssEapRadiusAttrProviderInit(OM_uint32 *minor);
+OM_uint32 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_RADIUS_H_ */