use JSON instead of DDF marshalling

[mech_eap.git] / util_saml.h

diff --git a/util_saml.h b/util_saml.h
index 351e70d..0a14d3e 100644 (file)
--- a/util_saml.h
+++ b/util_saml.h
@@ -75,15 +75,13 @@ public:
                                gss_any_t input) const;
 
     const char *prefix(void) const;
-    const char *marshallingKey(void) const {
-        return NULL;
-    }
-    bool unmarshallAndInit(const gss_eap_attr_ctx *manager GSSEAP_UNUSED,
-                           DDF &object GSSEAP_UNUSED) {
+    const char *name(void) const { return NULL; }
+    bool initWithJsonObject(const gss_eap_attr_ctx *manager GSSEAP_UNUSED,
+                           json_t *object GSSEAP_UNUSED) {
         return false;
     }
-    DDF marshall(void) const {
-        return DDF(NULL);
+    json_t *jsonRepresentation(void) const {
+        return NULL;
     }
 
     opensaml::saml2::Assertion *initAssertion(void);
@@ -137,30 +135,17 @@ 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 {
+    const char *name(void) const {
         return NULL;
     }
-    bool unmarshallAndInit(const gss_eap_attr_ctx *manager GSSEAP_UNUSED,
-                           DDF &object GSSEAP_UNUSED) {
+    bool initWithJsonObject(const gss_eap_attr_ctx *manager GSSEAP_UNUSED,
+                           json_t *object GSSEAP_UNUSED) {
         return false;
     }
-    DDF marshall(void) const {
-        return DDF(NULL);
+    json_t *jsonRepresentation(void) const {
+        return NULL;
     }
->>>>>>> eef7b3b... get DDF marshalling working
 
     bool getAttribute(const gss_buffer_t attr,
                       int *authenticated,