Refactoring reclaim attestations

1 files changed, 101 insertions, 619 deletions

diff --git a/src/reclaim-attribute/reclaim_attribute.c b/src/reclaim-attribute/reclaim_attribute.c
index 07d8200c6..936f9cb75 100644
--- a/src/reclaim-attribute/reclaim_attribute.c
+++ b/src/reclaim-attribute/reclaim_attribute.c
@@ -25,7 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_reclaim_attribute_plugin.h"
+#include "gnunet_reclaim_plugin.h"
 #include "reclaim_attribute.h"
 
 
@@ -42,7 +42,7 @@ struct Plugin
   /**
    * Plugin API
    */
-  struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions *api;
+  struct GNUNET_RECLAIM_AttributePluginFunctions *api;
 };
 
 
@@ -74,7 +74,7 @@ static int initialized;
 static void
 add_plugin (void *cls, const char *library_name, void *lib_ret)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions *api = lib_ret;
+  struct GNUNET_RECLAIM_AttributePluginFunctions *api = lib_ret;
   struct Plugin *plugin;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -110,7 +110,7 @@ init ()
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename)
+GNUNET_RECLAIM_attribute_typename_to_number (const char *typename)
 {
   unsigned int i;
   struct Plugin *plugin;
@@ -135,7 +135,7 @@ GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename)
  * @return corresponding typestring, NULL on error
  */
 const char *
-GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type)
+GNUNET_RECLAIM_attribute_number_to_typename (uint32_t type)
 {
   unsigned int i;
   struct Plugin *plugin;
@@ -164,7 +164,7 @@ GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type)
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type,
+GNUNET_RECLAIM_attribute_string_to_value (uint32_t type,
                                           const char *s,
                                           void **data,
                                           size_t *data_size)
@@ -196,7 +196,7 @@ GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type,
  * @return NULL on error, otherwise human-readable representation of the claim
  */
 char *
-GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type,
+GNUNET_RECLAIM_attribute_value_to_string (uint32_t type,
                                           const void *data,
                                           size_t data_size)
 {
@@ -217,140 +217,34 @@ GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type,
   return NULL;
 }
 
-/**
-   * Convert an attestation type name to the corresponding number
-   *
-   * @param typename name to convert
-   * @return corresponding number, UINT32_MAX on error
-   */
-uint32_t
-GNUNET_RECLAIM_ATTESTATION_typename_to_number (const char *typename)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  uint32_t ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = attr_plugins[i];
-    if (UINT32_MAX !=
-        (ret = plugin->api->typename_to_number_attest (plugin->api->cls,
-                                                       typename)))
-      return ret;
-  }
-  return UINT32_MAX;
-}
-
-/**
- * Convert an attestation type number to the corresponding attestation type string
- *
- * @param type number of a type
- * @return corresponding typestring, NULL on error
- */
-const char *
-GNUNET_RECLAIM_ATTESTATION_number_to_typename (uint32_t type)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  const char *ret;
-
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = attr_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->number_to_typename_attest (plugin->api->cls, type)))
-      return ret;
-  }
-  return NULL;
-}
-/**
- * Convert human-readable version of a 'claim' of an attestation to the binary
- * representation
- *
- * @param type type of the claim
- * @param s human-readable string
- * @param data set to value in binary encoding (will be allocated)
- * @param data_size set to number of bytes in @a data
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_RECLAIM_ATTESTATION_string_to_value (uint32_t type,
-                                            const char *s,
-                                            void **data,
-                                            size_t *data_size)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = attr_plugins[i];
-    if (GNUNET_OK == plugin->api->string_to_value_attest (plugin->api->cls,
-                                                          type,
-                                                          s,
-                                                          data,
-                                                          data_size))
-      return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert the 'claim' of an attestation to a string
- *
- * @param type the type of attestation
- * @param data claim in binary encoding
- * @param data_size number of bytes in @a data
- * @return NULL on error, otherwise human-readable representation of the claim
- */
-char *
-GNUNET_RECLAIM_ATTESTATION_value_to_string (uint32_t type,
-                                            const void *data,
-                                            size_t data_size)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  char *ret;
-
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = attr_plugins[i];
-    if (NULL != (ret = plugin->api->value_to_string_attest (plugin->api->cls,
-                                                            type,
-                                                            data,
-                                                            data_size)))
-      return ret;
-  }
-  return NULL;
-}
 
 /**
  * Create a new attribute.
  *
  * @param attr_name the attribute name
+ * @param attestation attestation ID of the attribute (maybe NULL)
  * @param type the attribute type
  * @param data the attribute value
  * @param data_size the attribute value size
  * @return the new attribute
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_Claim *
-GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char *attr_name,
-                                    uint32_t type,
-                                    const void *data,
-                                    size_t data_size)
+struct GNUNET_RECLAIM_Attribute *
+GNUNET_RECLAIM_attribute_new (const char *attr_name,
+                              const struct GNUNET_RECLAIM_Identifier *attestation,
+                              uint32_t type,
+                              const void *data,
+                              size_t data_size)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr;
+  struct GNUNET_RECLAIM_Attribute *attr;
   char *write_ptr;
   char *attr_name_tmp = GNUNET_strdup (attr_name);
 
   GNUNET_STRINGS_utf8_tolower (attr_name, attr_name_tmp);
 
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_Claim)
+  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_Attribute)
                         + strlen (attr_name_tmp) + 1 + data_size);
+  if (NULL != attestation)
+    attr->attestation = *attestation;
   attr->type = type;
   attr->data_size = data_size;
   attr->flag = 0;
@@ -364,76 +258,6 @@ GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char *attr_name,
   return attr;
 }
 
-/**
-   * Create a new attestation.
-   *
-   * @param attr_name the attestation name
-   * @param type the attestation type
-   * @param data the attestation value
-   * @param data_size the attestation value size
-   * @return the new attestation
-   */
-struct GNUNET_RECLAIM_ATTESTATION_Claim *
-GNUNET_RECLAIM_ATTESTATION_claim_new (const char *attr_name,
-                                      uint32_t type,
-                                      const void *data,
-                                      size_t data_size)
-{
-  struct GNUNET_RECLAIM_ATTESTATION_Claim *attr;
-  char *write_ptr;
-  char *attr_name_tmp = GNUNET_strdup (attr_name);
-
-  GNUNET_STRINGS_utf8_tolower (attr_name, attr_name_tmp);
-
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_ATTESTATION_Claim)
-                        + strlen (attr_name_tmp) + 1 + data_size);
-  attr->type = type;
-  attr->data_size = data_size;
-  attr->flag = 0;
-  write_ptr = (char *) &attr[1];
-  GNUNET_memcpy (write_ptr, attr_name_tmp, strlen (attr_name_tmp) + 1);
-  attr->name = write_ptr;
-  write_ptr += strlen (attr->name) + 1;
-  GNUNET_memcpy (write_ptr, data, data_size);
-  attr->data = write_ptr;
-  GNUNET_free (attr_name_tmp);
-  return attr;
-}
-
-/**
- * Create a new attestation reference.
- *
- * @param attr_name the referenced claim name
- * @param ref_value the claim name in the attestation
- * @return the new reference
- */
-struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *
-GNUNET_RECLAIM_ATTESTATION_reference_new (const char *attr_name,
-                                          const char *ref_value)
-{
-  struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *attr;
-  char *write_ptr;
-  char *attr_name_tmp = GNUNET_strdup (attr_name);
-  char *ref_value_tmp = GNUNET_strdup (ref_value);
-
-  GNUNET_STRINGS_utf8_tolower (attr_name, attr_name_tmp);
-  GNUNET_STRINGS_utf8_tolower (ref_value, ref_value_tmp);
-
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_ATTESTATION_REFERENCE)
-                        + strlen (attr_name_tmp) + strlen (ref_value_tmp) + 2);
-
-  write_ptr = (char *) &attr[1];
-  GNUNET_memcpy (write_ptr, attr_name_tmp, strlen (attr_name_tmp) + 1);
-  attr->name = write_ptr;
-
-  write_ptr += strlen (attr_name) + 1;
-  GNUNET_memcpy (write_ptr, ref_value_tmp, strlen (ref_value_tmp) + 1);
-  attr->reference_value = write_ptr;
-
-  GNUNET_free (attr_name_tmp);
-  GNUNET_free (ref_value_tmp);
-  return attr;
-}
 
 /**
  * Add a new attribute to a claim list
@@ -444,21 +268,23 @@ GNUNET_RECLAIM_ATTESTATION_reference_new (const char *attr_name,
  * @param data_size claim payload size
  */
 void
-GNUNET_RECLAIM_ATTRIBUTE_list_add (
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *claim_list,
+GNUNET_RECLAIM_attribute_list_add (
+  struct GNUNET_RECLAIM_AttributeList *al,
   const char *attr_name,
+  const struct GNUNET_RECLAIM_Identifier *attestation,
   uint32_t type,
   const void *data,
   size_t data_size)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
-
-  le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-  le->claim =
-    GNUNET_RECLAIM_ATTRIBUTE_claim_new (attr_name, type, data, data_size);
-  GNUNET_CONTAINER_DLL_insert (claim_list->list_head,
-                               claim_list->list_tail,
-                               le);
+  struct GNUNET_RECLAIM_AttributeListEntry *ale;
+
+  ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
+  ale->attribute =
+    GNUNET_RECLAIM_attribute_new (attr_name, attestation,
+                                  type, data, data_size);
+  GNUNET_CONTAINER_DLL_insert (al->list_head,
+                               al->list_tail,
+                               ale);
 }
 
 
@@ -469,36 +295,17 @@ GNUNET_RECLAIM_ATTRIBUTE_list_add (
  * @return the required buffer size
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (
-  const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs)
+GNUNET_RECLAIM_attribute_list_serialize_get_size (
+  const struct GNUNET_RECLAIM_AttributeList *al)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
+  struct GNUNET_RECLAIM_AttributeListEntry *ale;
   size_t len = 0;
 
-  for (le = attrs->list_head; NULL != le; le = le->next)
+  for (ale = al->list_head; NULL != ale; ale = ale->next)
   {
-    if (NULL != le->claim)
-    {
-      len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      len += GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (le->claim);
-    }
-    else if (NULL != le->attest )
-    {
-      len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      len += GNUNET_RECLAIM_ATTESTATION_serialize_get_size (le->attest);
-    }
-    else if (NULL != le->reference)
-    {
-      len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      len += GNUNET_RECLAIM_ATTESTATION_REF_serialize_get_size (le->reference);
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unserialized Claim List Entry Type for size not known.\n");
-      break;
-    }
-    len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
+    GNUNET_assert (NULL != ale->attribute);
+    len += GNUNET_RECLAIM_attribute_serialize_get_size (ale->attribute);
+    len += sizeof(struct GNUNET_RECLAIM_AttributeListEntry);
   }
   return len;
 }
@@ -512,58 +319,22 @@ GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (
  * @return length of serialized data
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_list_serialize (
-  const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
+GNUNET_RECLAIM_attribute_list_serialize (
+  const struct GNUNET_RECLAIM_AttributeList *al,
   char *result)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
+  struct GNUNET_RECLAIM_AttributeListEntry *ale;
   size_t len;
   size_t total_len;
   char *write_ptr;
   write_ptr = result;
   total_len = 0;
-  for (le = attrs->list_head; NULL != le; le = le->next)
+  for (ale = al->list_head; NULL != ale; ale = ale->next)
   {
-    struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType *list_type;
-    if (NULL != le->claim)
-    {
-      list_type = (struct
-                   GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType *) write_ptr;
-      list_type->type = htons (1);
-      total_len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      write_ptr += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      len = GNUNET_RECLAIM_ATTRIBUTE_serialize (le->claim, write_ptr);
-      total_len += len;
-      write_ptr += len;
-    }
-    else if (NULL != le->attest )
-    {
-      list_type = (struct
-                   GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType *) write_ptr;
-      list_type->type = htons (2);
-      total_len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      write_ptr += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      len = GNUNET_RECLAIM_ATTESTATION_serialize (le->attest, write_ptr);
-      total_len += len;
-      write_ptr += len;
-    }
-    else if (NULL != le->reference)
-    {
-      list_type = (struct
-                   GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType *) write_ptr;
-      list_type->type = htons (3);
-      total_len += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      write_ptr += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      len = GNUNET_RECLAIM_ATTESTATION_REF_serialize (le->reference, write_ptr);
-      total_len += len;
-      write_ptr += len;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unserialized Claim List Entry Type not known.\n");
-      continue;
-    }
+    GNUNET_assert (NULL != ale->attribute);
+    len = GNUNET_RECLAIM_attribute_serialize (ale->attribute, write_ptr);
+    total_len += len;
+    write_ptr += len;
   }
   return total_len;
 }
@@ -576,85 +347,30 @@ GNUNET_RECLAIM_ATTRIBUTE_list_serialize (
  * @param data_size the length of the serialized data
  * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *
-GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char *data, size_t data_size)
+struct GNUNET_RECLAIM_AttributeList *
+GNUNET_RECLAIM_attribute_list_deserialize (const char *data, size_t data_size)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
+  struct GNUNET_RECLAIM_AttributeList *al;
+  struct GNUNET_RECLAIM_AttributeListEntry *ale;
   size_t attr_len;
   const char *read_ptr;
 
-  if ((data_size < sizeof(struct Attribute) + sizeof(struct
-                                                     GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry))
-      && (data_size < sizeof(struct
-                             Attestation)
-          + sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry)) &&
-      (data_size < sizeof(struct Attestation_Reference) + sizeof(struct
-                                                                 GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry)) )
-    return NULL;
-
-  attrs = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList);
+  al = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
+  if (data_size < sizeof(struct Attribute) + sizeof(struct
+                                                    GNUNET_RECLAIM_AttributeListEntry))
+    return al;
   read_ptr = data;
   while (((data + data_size) - read_ptr) >= sizeof(struct Attribute))
   {
-    struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType *list_type;
-    list_type = (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType *) read_ptr;
-    if (1 == ntohs (list_type->type))
-    {
-      le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-      read_ptr += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      if (((data + data_size) - read_ptr) < sizeof(struct Attribute))
-        break;
-      le->attest = NULL;
-      le->reference = NULL;
-      le->claim =
-        GNUNET_RECLAIM_ATTRIBUTE_deserialize (read_ptr,
-                                              data_size - (read_ptr - data));
-      GNUNET_CONTAINER_DLL_insert (attrs->list_head, attrs->list_tail, le);
-      attr_len = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (le->claim);
-      read_ptr += attr_len;
-    }
-    else if (2 == ntohs (list_type->type))
-    {
-      le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-      read_ptr += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      if (((data + data_size) - read_ptr) < sizeof(struct Attestation))
-        break;
-      le->claim = NULL;
-      le->reference = NULL;
-      le->attest =
-        GNUNET_RECLAIM_ATTESTATION_deserialize (read_ptr,
-                                                data_size - (read_ptr - data));
-      GNUNET_CONTAINER_DLL_insert (attrs->list_head, attrs->list_tail, le);
-      attr_len = GNUNET_RECLAIM_ATTESTATION_serialize_get_size (le->attest);
-      read_ptr += attr_len;
-    }
-    else if (3 == ntohs (list_type->type))
-    {
-      le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-      read_ptr += sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntryType);
-      if (((data + data_size) - read_ptr) < sizeof(struct
-                                                   Attestation_Reference))
-        break;
-      le->claim = NULL;
-      le->attest = NULL;
-      le->reference =
-        GNUNET_RECLAIM_ATTESTATION_REF_deserialize (read_ptr,
-                                                    data_size - (read_ptr
-                                                                 - data));
-      GNUNET_CONTAINER_DLL_insert (attrs->list_head, attrs->list_tail, le);
-      attr_len = GNUNET_RECLAIM_ATTESTATION_REF_serialize_get_size (
-        le->reference);
-      read_ptr += attr_len;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Serialized Claim List Entry Type not known.\n");
-      break;
-    }
+    ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
+    ale->attribute =
+      GNUNET_RECLAIM_attribute_deserialize (read_ptr,
+                                            data_size - (read_ptr - data));
+    GNUNET_CONTAINER_DLL_insert (al->list_head, al->list_tail, ale);
+    attr_len = GNUNET_RECLAIM_attribute_serialize_get_size (ale->attribute);
+    read_ptr += attr_len;
   }
-  return attrs;
+  return al;
 }
 
 
@@ -663,57 +379,33 @@ GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char *data, size_t data_size)
  * @param attrs claim list to copy
  * @return copied claim list
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *
-GNUNET_RECLAIM_ATTRIBUTE_list_dup (
-  const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs)
+struct GNUNET_RECLAIM_AttributeList *
+GNUNET_RECLAIM_attribute_list_dup (
+  const struct GNUNET_RECLAIM_AttributeList *al)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *result_le;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *result;
+  struct GNUNET_RECLAIM_AttributeListEntry *ale;
+  struct GNUNET_RECLAIM_AttributeListEntry *result_ale;
+  struct GNUNET_RECLAIM_AttributeList *result;
 
-  result = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList);
-  if (NULL == attrs->list_head)
+  result = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
+  for (ale = al->list_head; NULL != ale; ale = ale->next)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Duplicating empty List\n");
-  }
-  for (le = attrs->list_head; NULL != le; le = le->next)
-  {
-    result_le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-    result_le->claim = NULL;
-    result_le->attest = NULL;
-    result_le->reference = NULL;
-    if (NULL != le->claim)
-    {
-      result_le->claim =
-        GNUNET_RECLAIM_ATTRIBUTE_claim_new (le->claim->name,
-                                            le->claim->type,
-                                            le->claim->data,
-                                            le->claim->data_size);
-
-      result_le->claim->id = le->claim->id;
-      result_le->claim->flag = le->claim->flag;
-    }
-    if ( NULL != le->attest)
-    {
-      result_le->attest = GNUNET_RECLAIM_ATTESTATION_claim_new (
-        le->attest->name,
-        le->attest->type,
-        le->attest->data,
-        le->attest->
-        data_size);
-      result_le->attest->id = le->attest->id;
-    }
-    if (NULL !=le->reference)
+    result_ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
+    GNUNET_assert (NULL != ale->attribute);
     {
-      result_le->reference = GNUNET_RECLAIM_ATTESTATION_reference_new (
-        le->reference->name,
-        le->reference->reference_value);
-      result_le->reference->id = le->reference->id;
-      result_le->reference->id_attest = le->reference->id_attest;
+      result_ale->attribute =
+        GNUNET_RECLAIM_attribute_new (ale->attribute->name,
+                                      &ale->attribute->attestation,
+                                      ale->attribute->type,
+                                      ale->attribute->data,
+                                      ale->attribute->data_size);
+
+      result_ale->attribute->id = ale->attribute->id;
+      result_ale->attribute->flag = ale->attribute->flag;
     }
     GNUNET_CONTAINER_DLL_insert (result->list_head,
                                  result->list_tail,
-                                 result_le);
+                                 result_ale);
   }
   return result;
 }
@@ -725,45 +417,24 @@ GNUNET_RECLAIM_ATTRIBUTE_list_dup (
  * @param attrs list to destroy
  */
 void
-GNUNET_RECLAIM_ATTRIBUTE_list_destroy (
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs)
+GNUNET_RECLAIM_attribute_list_destroy (
+  struct GNUNET_RECLAIM_AttributeList *al)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *tmp_le;
+  struct GNUNET_RECLAIM_AttributeListEntry *ale;
+  struct GNUNET_RECLAIM_AttributeListEntry *tmp_ale;
 
-  for (le = attrs->list_head; NULL != le; le = le->next)
+  for (ale = al->list_head; NULL != ale; ale = ale->next)
   {
-    if (NULL != le->claim)
-      GNUNET_free (le->claim);
-    if (NULL != le->attest)
-      GNUNET_free (le->attest);
-    if (NULL != le->reference)
-      GNUNET_free (le->reference);
-    tmp_le = le;
-    le = le->next;
-    GNUNET_free (tmp_le);
+    if (NULL != ale->attribute)
+      GNUNET_free (ale->attribute);
+    tmp_ale = ale;
+    ale = ale->next;
+    GNUNET_free (tmp_ale);
   }
-  GNUNET_free (attrs);
+  GNUNET_free (al);
 }
 
-/**
- * Count attestations in claim list
- *
- * @param attrs list
- */
-int
-GNUNET_RECLAIM_ATTRIBUTE_list_count_attest (
-  const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs)
-{
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
-  int i = 0;
-  for (le = attrs->list_head; NULL != le; le = le->next)
-  {
-    if (NULL != le->attest)
-      i++;
-  }
-  return i;
-}
+
 /**
  * Get required size for serialization buffer
  *
@@ -771,8 +442,8 @@ GNUNET_RECLAIM_ATTRIBUTE_list_count_attest (
  * @return the required buffer size
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (
-  const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr)
+GNUNET_RECLAIM_attribute_serialize_get_size (
+  const struct GNUNET_RECLAIM_Attribute *attr)
 {
   return sizeof(struct Attribute) + strlen (attr->name) + attr->data_size;
 }
@@ -786,8 +457,8 @@ GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (
  * @return length of serialized data
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_serialize (
-  const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
+GNUNET_RECLAIM_attribute_serialize (
+  const struct GNUNET_RECLAIM_Attribute *attr,
   char *result)
 {
   size_t data_len_ser;
@@ -823,10 +494,10 @@ GNUNET_RECLAIM_ATTRIBUTE_serialize (
  *
  * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_Claim *
-GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char *data, size_t data_size)
+struct GNUNET_RECLAIM_Attribute *
+GNUNET_RECLAIM_attribute_deserialize (const char *data, size_t data_size)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr;
+  struct GNUNET_RECLAIM_Attribute *attr;
   struct Attribute *attr_ser;
   size_t data_len;
   size_t name_len;
@@ -844,7 +515,7 @@ GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char *data, size_t data_size)
                 "Buffer too small to deserialize\n");
     return NULL;
   }
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_ATTRIBUTE_Claim)
+  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_Attribute)
                         + data_len + name_len + 1);
   attr->type = ntohs (attr_ser->attribute_type);
   attr->flag = ntohl (attr_ser->attribute_flag);
@@ -863,193 +534,4 @@ GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char *data, size_t data_size)
 }
 
 
-/**
- * Get required size for serialization buffer
- *
- * @param attr the attestation to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_ATTESTATION_serialize_get_size (
-  const struct GNUNET_RECLAIM_ATTESTATION_Claim *attr)
-{
-  return sizeof(struct Attestation) + strlen (attr->name) + attr->data_size;
-}
-
-/**
- * Serialize an attestation
- *
- * @param attr the attestation to serialize
- * @param result the serialized attestation
- * @return length of serialized data
- */
-size_t
-GNUNET_RECLAIM_ATTESTATION_serialize (
-  const struct GNUNET_RECLAIM_ATTESTATION_Claim *attr,
-  char *result)
-{
-  size_t data_len_ser;
-  size_t name_len;
-  struct Attestation *attr_ser;
-  char *write_ptr;
-
-  attr_ser = (struct Attestation *) result;
-  attr_ser->attestation_type = htons (attr->type);
-  attr_ser->attestation_flag = htonl (attr->flag);
-  attr_ser->attestation_id = attr->id;
-  name_len = strlen (attr->name);
-  attr_ser->name_len = htons (name_len);
-  write_ptr = (char *) &attr_ser[1];
-  GNUNET_memcpy (write_ptr, attr->name, name_len);
-  write_ptr += name_len;
-  // TODO plugin-ize
-  // data_len_ser = plugin->serialize_attribute_value (attr,
-  //                                                  &attr_ser[1]);
-  data_len_ser = attr->data_size;
-  GNUNET_memcpy (write_ptr, attr->data, attr->data_size);
-  attr_ser->data_size = htons (data_len_ser);
-
-  return sizeof(struct Attestation) + strlen (attr->name) + attr->data_size;
-}
-
-/**
- * Deserialize an attestation
- *
- * @param data the serialized attestation
- * @param data_size the length of the serialized data
- *
- * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
- */
-struct GNUNET_RECLAIM_ATTESTATION_Claim *
-GNUNET_RECLAIM_ATTESTATION_deserialize (const char *data, size_t data_size)
-{
-  struct GNUNET_RECLAIM_ATTESTATION_Claim *attr;
-  struct Attestation *attr_ser;
-  size_t data_len;
-  size_t name_len;
-  char *write_ptr;
-
-  if (data_size < sizeof(struct Attestation))
-    return NULL;
-
-  attr_ser = (struct Attestation *) data;
-  data_len = ntohs (attr_ser->data_size);
-  name_len = ntohs (attr_ser->name_len);
-  if (data_size < sizeof(struct Attestation) + data_len + name_len)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Buffer too small to deserialize\n");
-    return NULL;
-  }
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_ATTESTATION_Claim)
-                        + data_len + name_len + 1);
-  attr->type = ntohs (attr_ser->attestation_type);
-  attr->flag = ntohl (attr_ser->attestation_flag);
-  attr->id = attr_ser->attestation_id;
-  attr->data_size = data_len;
-
-  write_ptr = (char *) &attr[1];
-  GNUNET_memcpy (write_ptr, &attr_ser[1], name_len);
-  write_ptr[name_len] = '\0';
-  attr->name = write_ptr;
-
-  write_ptr += name_len + 1;
-  GNUNET_memcpy (write_ptr, (char *) &attr_ser[1] + name_len, attr->data_size);
-  attr->data = write_ptr;
-  return attr;
-}
-
-/**
- * Get required size for serialization buffer
- *
- * @param attr the reference to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_ATTESTATION_REF_serialize_get_size (
-  const struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *attr)
-{
-  return sizeof(struct Attestation_Reference) + strlen (attr->name) + strlen (
-    attr->reference_value);
-}
-
-
-/**
- * Serialize a reference
- *
- * @param attr the reference to serialize
- * @param result the serialized reference
- * @return length of serialized data
- */
-size_t
-GNUNET_RECLAIM_ATTESTATION_REF_serialize (
-  const struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *attr,
-  char *result)
-{
-  size_t name_len;
-  size_t refval_len;
-  struct Attestation_Reference *attr_ser;
-  char *write_ptr;
-  attr_ser = (struct Attestation_Reference *) result;
-  attr_ser->reference_id = attr->id;
-  attr_ser->attestation_id = attr->id_attest;
-  name_len = strlen (attr->name);
-  refval_len = strlen (attr->reference_value);
-  attr_ser->name_len = htons (name_len);
-  attr_ser->ref_value_len = htons (refval_len);
-  write_ptr = (char *) &attr_ser[1];
-  GNUNET_memcpy (write_ptr, attr->name, name_len);
-  write_ptr += name_len;
-  GNUNET_memcpy (write_ptr, attr->reference_value, refval_len);
-
-  return sizeof(struct Attestation_Reference) + strlen (attr->name) + strlen (
-    attr->reference_value);
-}
-
-
-/**
- * Deserialize a reference
- *
- * @param data the serialized reference
- * @param data_size the length of the serialized data
- *
- * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
- */
-struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *
-GNUNET_RECLAIM_ATTESTATION_REF_deserialize (const char *data, size_t data_size)
-{
-  struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *attr;
-  struct Attestation_Reference *attr_ser;
-  size_t name_len;
-  size_t refval_len;
-  char *write_ptr;
-
-  if (data_size < sizeof(struct Attestation_Reference))
-    return NULL;
-  attr_ser = (struct Attestation_Reference *) data;
-  name_len = ntohs (attr_ser->name_len);
-  refval_len = ntohs (attr_ser->ref_value_len);
-  if (data_size < sizeof(struct Attestation_Reference) + refval_len + name_len)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Buffer too small to deserialize\n");
-    return NULL;
-  }
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_ATTESTATION_REFERENCE)
-                        + refval_len + name_len + 2);
-
-  attr->id = attr_ser->reference_id;
-  attr->id_attest = attr_ser->attestation_id;
-
-  write_ptr = (char *) &attr[1];
-  GNUNET_memcpy (write_ptr, &attr_ser[1], name_len);
-  write_ptr[name_len] = '\0';
-  attr->name = write_ptr;
-
-  write_ptr += name_len + 1;
-  GNUNET_memcpy (write_ptr, (char *) &attr_ser[1] + name_len, refval_len);
-  write_ptr[refval_len] = '\0';
-  attr->reference_value = write_ptr;
-  return attr;
-}
 /* end of reclaim_attribute.c */