Merge branch 'master' into tlv-mic

[moonshot.git] / mech_eap / util_shib.h

diff --git a/mech_eap/util_shib.h b/mech_eap/util_shib.h
index 8224547..4cf7481 100644 (file)
--- a/mech_eap/util_shib.h
+++ b/mech_eap/util_shib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,9 +54,9 @@ public:
     gss_eap_shib_attr_provider(void);
     ~gss_eap_shib_attr_provider(void);
 
-    bool initFromExistingContext(const gss_eap_attr_ctx *source,
+    bool initWithExistingContext(const gss_eap_attr_ctx *source,
                                  const gss_eap_attr_provider *ctx);
-    bool initFromGssContext(const gss_eap_attr_ctx *source,
+    bool initWithGssContext(const gss_eap_attr_ctx *source,
                             const gss_cred_id_t cred,
                             const gss_ctx_id_t ctx);
 
@@ -76,15 +76,23 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
-    void exportToBuffer(gss_buffer_t buffer) const;
-    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
-                        const gss_buffer_t buffer);
+    const char *prefix(void) const;
+    const char *name(void) const;
+    bool initWithJsonObject(const gss_eap_attr_ctx *manager,
+                            JSONObject &obj);
+    JSONObject jsonRepresentation(void) const;
 
     static bool init(void);
     static void finalize(void);
 
+    OM_uint32 mapException(OM_uint32 *minor, std::exception &e) const;
+
     static gss_eap_attr_provider *createAttrContext(void);
 
+    std::vector<shibsp::Attribute *> getAttributes(void) const {
+        return m_attributes;
+    }
+
 private:
     static shibsp::Attribute *
         duplicateAttribute(const shibsp::Attribute *src);
@@ -94,22 +102,13 @@ private:
     ssize_t getAttributeIndex(const gss_buffer_t attr) const;
     const shibsp::Attribute *getAttribute(const gss_buffer_t attr) const;
 
-    std::vector<shibsp::Attribute *> getAttributes(void) const {
-        return m_attributes;
-    }
-
     bool authenticated(void) const { return m_authenticated; }
 
-    friend bool
-    addRadiusAttribute(const gss_eap_attr_provider *source,
-                       const gss_buffer_t attribute,
-                       void *data);
-
+    bool m_initialized;
+    bool m_authenticated;
     std::vector<shibsp::Attribute *> m_attributes;
-    int m_authenticated;
 };
 
-
 extern "C" {
 #endif