in progress use DDF to serialise names

[moonshot.git] / mech_eap / util_saml.cpp

diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp
index 24d125d..1a2c81e 100644 (file)
--- a/mech_eap/util_saml.cpp
+++ b/mech_eap/util_saml.cpp
@@ -304,6 +304,8 @@ gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSE
     delete ((saml2::Assertion *)input);
 }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 const char *
 gss_eap_saml_assertion_provider::prefix(void) const
 {
@@ -312,18 +314,23 @@ gss_eap_saml_assertion_provider::prefix(void) const
 
 void
 gss_eap_saml_assertion_provider::exportToBuffer(gss_buffer_t buffer) const
+=======
+DDF
+gss_eap_saml_assertion_provider::marshall(void) const
+>>>>>>> 1ef293a... in progress use DDF to serialise names
 {
-    buffer->length = 0;
-    buffer->value = NULL;
+    return DDF(NULL);
 }
 
 bool
-gss_eap_saml_assertion_provider::initFromBuffer(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
-                                                const gss_buffer_t buffer GSSEAP_UNUSED)
+gss_eap_saml_assertion_provider::unmarshallAndInit(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
+                                                   DDF &object GSSEAP_UNUSED)
 {
     return false;
 }
 
+=======
+>>>>>>> eef7b3b... get DDF marshalling working
 bool
 gss_eap_saml_assertion_provider::init(void)
 {
@@ -688,6 +695,8 @@ gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UN
 {
 }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 const char *
 gss_eap_saml_attr_provider::prefix(void) const
 {
@@ -696,18 +705,23 @@ gss_eap_saml_attr_provider::prefix(void) const
 
 void
 gss_eap_saml_attr_provider::exportToBuffer(gss_buffer_t buffer) const
+=======
+DDF
+gss_eap_saml_attr_provider::marshall(void) const
+>>>>>>> 1ef293a... in progress use DDF to serialise names
 {
-    buffer->length = 0;
-    buffer->value = NULL;
+    return DDF(NULL);
 }
 
 bool
-gss_eap_saml_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
-                                           const gss_buffer_t buffer GSSEAP_UNUSED)
+gss_eap_saml_attr_provider::unmarshallAndInit(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
+                                              DDF &object GSSEAP_UNUSED)
 {
     return false;
 }
 
+=======
+>>>>>>> eef7b3b... get DDF marshalling working
 bool
 gss_eap_saml_attr_provider::init(void)
 {