in progress use DDF to serialise names

[moonshot.git] / mech_eap / util_saml.h

diff --git a/mech_eap/util_saml.h b/mech_eap/util_saml.h
index 17edb2b..351e70d 100644 (file)
--- a/mech_eap/util_saml.h
+++ b/mech_eap/util_saml.h
@@ -75,10 +75,16 @@ public:
                                gss_any_t input) const;
 
     const char *prefix(void) const;
-    void exportToBuffer(gss_buffer_t buffer) const;
-
-    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
-                        const gss_buffer_t buffer);
+    const char *marshallingKey(void) const {
+        return NULL;
+    }
+    bool unmarshallAndInit(const gss_eap_attr_ctx *manager GSSEAP_UNUSED,
+                           DDF &object GSSEAP_UNUSED) {
+        return false;
+    }
+    DDF marshall(void) const {
+        return DDF(NULL);
+    }
 
     opensaml::saml2::Assertion *initAssertion(void);
 
@@ -131,11 +137,30 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     const char *prefix(void) const;
 
     void exportToBuffer(gss_buffer_t buffer) const;
     bool initFromBuffer(const gss_eap_attr_ctx *ctx,
                         const gss_buffer_t buffer);
+=======
+    bool unmarshallAndInit(const gss_eap_attr_ctx *manager,
+                           DDF &object GSSEAP_UNUSED);
+    DDF marshall(void) const;
+>>>>>>> 1ef293a... in progress use DDF to serialise names
+=======
+    const char *marshallingKey(void) const {
+        return NULL;
+    }
+    bool unmarshallAndInit(const gss_eap_attr_ctx *manager GSSEAP_UNUSED,
+                           DDF &object GSSEAP_UNUSED) {
+        return false;
+    }
+    DDF marshall(void) const {
+        return DDF(NULL);
+    }
+>>>>>>> eef7b3b... get DDF marshalling working
 
     bool getAttribute(const gss_buffer_t attr,
                       int *authenticated,