use JSON instead of DDF marshalling

[mech_eap.git] / util_saml.cpp

diff --git a/util_saml.cpp b/util_saml.cpp
index 1a2c81e..8722b84 100644 (file)
--- a/util_saml.cpp
+++ b/util_saml.cpp
@@ -304,33 +304,12 @@ 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
 {
     return "urn:ietf:params:gss-eap:saml-aaa-assertion";
 }
 
-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
-{
-    return DDF(NULL);
-}
-
-bool
-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)
 {
@@ -695,33 +674,12 @@ 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
 {
     return "urn:ietf:params:gss-eap:saml-attr";
 }
 
-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
-{
-    return DDF(NULL);
-}
-
-bool
-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)
 {