BUILD: Move reclaim to service

44 files changed, 0 insertions, 21432 deletions

diff --git a/src/reclaim/.gitignore b/src/reclaim/.gitignore
deleted file mode 100644
index e22aa5011..000000000
--- a/src/reclaim/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-gnunet-reclaim
-gnunet-service-reclaim
-gnunet-did
-test_did_helper
-test_reclaim_attribute
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
deleted file mode 100644
index e5603d662..000000000
--- a/src/reclaim/Makefile.am
+++ /dev/null
@@ -1,252 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-
-REST_PLUGIN = \
-  libgnunet_plugin_rest_reclaim.la
-
-if HAVE_JOSE
-REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
-endif
-
-CREDENTIAL_PLUGIN = \
-  libgnunet_plugin_reclaim_credential_jwt.la
-
-if HAVE_PABC
-  CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
-  REST_PLUGIN += libgnunet_plugin_rest_pabc.la
-endif
-
-EXTRA_DIST = \
-  reclaim.conf \
-  test_reclaim_defaults.conf \
-  test_reclaim.conf \
-  $(check_SCRIPTS)
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  reclaim.conf
-
-lib_LTLIBRARIES = \
-  libgnunetreclaim.la \
-  libgnunetdid.la
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_reclaim.la \
-  libgnunet_plugin_reclaim_attribute_basic.la \
-  $(CREDENTIAL_PLUGIN) \
-  $(REST_PLUGIN)
-
-bin_PROGRAMS = \
- gnunet-reclaim \
- gnunet-did
-
-libexec_PROGRAMS = \
- gnunet-service-reclaim
-
-libgnunet_plugin_rest_reclaim_la_SOURCES = \
-  plugin_rest_reclaim.c \
-  json_reclaim.h \
-  json_reclaim.c
-libgnunet_plugin_rest_reclaim_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetreclaim.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-if HAVE_JOSE
-libgnunet_plugin_rest_openid_connect_la_SOURCES = \
-  plugin_rest_openid_connect.c \
-  oidc_helper.h \
-  oidc_helper.c
-libgnunet_plugin_rest_openid_connect_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetreclaim.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/gns/libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
-        $(LIBGCRYPT_LIBS)
-libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-if HAVE_PABC
-libgnunet_plugin_rest_pabc_la_SOURCES = \
-  plugin_rest_pabc.c \
-  pabc_helper.c
-libgnunet_plugin_rest_pabc_la_LIBADD = \
-  libgnunetreclaim.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
-libgnunet_plugin_rest_pabc_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_pabc_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-
-libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
-  plugin_gnsrecord_reclaim.c
-libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_service_reclaim_SOURCES = \
- gnunet-service-reclaim.c \
- gnunet-service-reclaim_tickets.c \
- gnunet-service-reclaim_tickets.h
-gnunet_service_reclaim_LDADD = \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(GN_LIBINTL)
-
-libgnunetreclaim_la_SOURCES = \
- reclaim_api.c \
- reclaim.h \
- reclaim_attribute.c \
- reclaim_attribute.h \
- reclaim_credential.c \
- reclaim_credential.h
-libgnunetreclaim_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetreclaim_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-libgnunetdid_la_SOURCES = \
-  did_helper.c \
-  did_helper.h \
-  did_core.h \
-  did_core.c
-libgnunetdid_la_LIBADD = \
-        $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/service/gns/libgnunetgns.la \
-        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-        $(top_builddir)/src/service/identity/libgnunetidentity.la \
-        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-        -ljansson \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetdid_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
-  plugin_reclaim_attribute_basic.c
-libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_PABC
-libgnunet_plugin_reclaim_credential_pabc_la_SOURCES = \
-  plugin_reclaim_credential_pabc.c \
-  pabc_helper.c \
-        pabc_helper.h
-libgnunet_plugin_reclaim_credential_pabc_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetreclaim.la \
-  -ljansson\
-  -lpabc \
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_pabc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-
-libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
-  plugin_reclaim_credential_jwt.c
-libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetreclaim.la \
-  -ljansson\
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-gnunet_reclaim_SOURCES = \
- gnunet-reclaim.c
-gnunet_reclaim_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  libgnunetreclaim.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL)
-
-test_reclaim_attribute_SOURCES = \
-  test_reclaim_attribute.c
-test_reclaim_attribute_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetreclaim.la \
-  $(GN_LIBINTL)
-
-gnunet_did_SOURCES = \
-        gnunet-did.c
-gnunet_did_LDADD = \
-        $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/service/gns/libgnunetgns.la \
-        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-        $(top_builddir)/src/service/identity/libgnunetidentity.la \
-        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  libgnunetdid.la \
-        -ljansson
-
-
-test_did_helper_SOURCES = \
-  test_did_helper.c
-test_did_helper_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/service/gns/libgnunetgns.la \
-        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-        $(top_builddir)/src/service/identity/libgnunetidentity.la \
-        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  libgnunetdid.la \
-  -ljansson
-
-check_SCRIPTS = \
-  test_reclaim_attribute.sh \
-  test_reclaim_issue.sh \
-  test_reclaim_consume.sh
-
-check_PROGRAMS = \
-  test_reclaim_attribute \
-  test_did_helper
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = \
-  $(check_SCRIPTS) \
-  $(check_PROGRAMS)
-endif
diff --git a/src/reclaim/did.h b/src/reclaim/did.h
deleted file mode 100644
index ab1b65925..000000000
--- a/src/reclaim/did.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2022 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-#ifndef RECLAIM_DID_H
-#define RECLAIM_DID_H
-
-#define GNUNET_RECLAIM_DID_METHOD_PREFIX "did:gns:"
-
-/**
- * Create a DID string from an ego in the format
- * did:gns:\<pubkey\>
- *
- * @param ego the Ego to use
- * @return the DID string
- */
-char*
-DID_ego_to_did (struct GNUNET_IDENTITY_Ego *ego);
-
-
-/**
- * Extract the public key from a DID
- * in the format did:gns:\<pubkey\>
- *
- * @param did the DID parse
- * @param pk where to store the public key
- * @return GNUNET_OK if successful
- */
-enum GNUNET_GenericReturnValue
-DID_public_key_from_did (const char* did,
-                         struct GNUNET_CRYPTO_PublicKey *pk);
-
-#endif
diff --git a/src/reclaim/did_core.c b/src/reclaim/did_core.c
deleted file mode 100644
index ce3336b91..000000000
--- a/src/reclaim/did_core.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/did_core.c
- * @brief Core functionality for DID
- * @author Tristan Schwieren
- */
-
-// TODO: DID documents do not have an expiration date. Still we add one
-// TODO: Store DID document with empty label and own type (maybe DID-Document or JSON??)
-
-#include "platform.h"
-#include "did_core.h"
-
-struct DID_resolve_return
-{
-  DID_resolve_callback *cb;
-  void *cls;
-};
-
-struct DID_action_return
-{
-  DID_action_callback *cb;
-  void *cls;
-};
-
-// ------------------------------------------------ //
-// -------------------- Resolve ------------------- //
-// ------------------------------------------------ //
-
-/**
- * @brief GNS lookup callback. Calls the given callback function
- * and gives it the DID Document.
- * Fails if there is more than one DID record.
- *
- * @param cls closure
- * @param rd_count number of records in rd
- * @param rd the records in the reply
- */
-static void
-DID_resolve_gns_lookup_cb (
-  void *cls,
-  uint32_t rd_count,
-  const struct GNUNET_GNSRECORD_Data *rd)
-{
-  char *did_document;
-  DID_resolve_callback *cb = ((struct DID_resolve_return *) cls)->cb;
-  void *cls_did_resolve_cb = ((struct DID_resolve_return *) cls)->cls;
-  free (cls);
-
-  for (int i = 0; i < rd_count; i++) {
-    if (rd[i].record_type != GNUNET_GNSRECORD_TYPE_DID_DOCUMENT)
-      continue;
-    did_document = (char *) rd[i].data;
-    cb (GNUNET_OK, did_document, cls_did_resolve_cb);
-    return;
-  }
-  cb (GNUNET_NO, "DID Document is not a DID_DOCUMENT record\n",
-      cls_did_resolve_cb);
-}
-
-/**
- * @brief Resolve a DID.
- * Calls the given callback function with the resolved DID Document and the given closure.
- * If the did can not be resolved did_document is NULL.
- *
- * @param did DID that is resolve
- */
-enum GNUNET_GenericReturnValue
-DID_resolve (const char *did,
-             struct GNUNET_GNS_Handle *gns_handle,
-             DID_resolve_callback *cont,
-             void *cls)
-{
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  // did, gns_handle and cont must me set
-  if ((did == NULL) || (gns_handle == NULL) || (cont == NULL))
-    return GNUNET_NO;
-
-  if (GNUNET_OK != DID_did_to_pkey (did, &pkey))
-    return GNUNET_NO;
-
-  // Create closure for lookup callback
-  struct DID_resolve_return *cls_gns_lookup_cb
-    = malloc (sizeof(struct DID_resolve_return));
-  cls_gns_lookup_cb->cb = cont;
-  cls_gns_lookup_cb->cls = cls;
-
-  GNUNET_GNS_lookup (gns_handle,
-                     DID_DOCUMENT_LABEL,
-                     &pkey,
-                     GNUNET_GNSRECORD_TYPE_DID_DOCUMENT,
-                     GNUNET_GNS_LO_DEFAULT,
-                     &DID_resolve_gns_lookup_cb,
-                     cls_gns_lookup_cb);
-
-  return GNUNET_OK;
-}
-
-// ------------------------------------------------ //
-// -------------------- Create -------------------- //
-// ------------------------------------------------ //
-
-static void
-DID_create_did_store_cb (void *cls,
-                         enum GNUNET_ErrorCode ec)
-{
-  DID_action_callback *cb = ((struct DID_action_return *) cls)->cb;
-  void *cls_did_create_cb = ((struct DID_action_return *) cls)->cls;
-  free (cls);
-
-  if (GNUNET_EC_NONE == ec)
-  {
-    cb (GNUNET_OK, (void *) cls_did_create_cb);
-  }
-  else
-  {
-    // TODO: Log emsg. Not writing it to STDOUT
-    printf ("%s\n", GNUNET_ErrorCode_get_hint (ec));
-    cb (GNUNET_NO, (void *) cls_did_create_cb);
-  }
-}
-
-struct DID_create_namestore_lookup_closure
-{
-  const char *did_document;
-  struct GNUNET_TIME_Relative expire_time;
-  struct GNUNET_NAMESTORE_Handle *namestore_handle;
-  struct DID_action_return *ret;
-};
-
-static void
-DID_create_namestore_lookup_cb (void *cls,
-                                const struct
-                                GNUNET_CRYPTO_PrivateKey *zone,
-                                const char *label,
-                                unsigned int rd_count,
-                                const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct GNUNET_GNSRECORD_Data record_data;
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  const char *did_document
-    = ((struct DID_create_namestore_lookup_closure *) cls)->did_document;
-
-  const struct GNUNET_TIME_Relative expire_time
-    = ((struct DID_create_namestore_lookup_closure *) cls)->expire_time;
-
-  struct GNUNET_NAMESTORE_Handle *namestore_handle
-    = ((struct DID_create_namestore_lookup_closure *) cls)->namestore_handle;
-
-  struct DID_action_return *cls_record_store_cb
-    = ((struct DID_create_namestore_lookup_closure *) cls)->ret;
-
-  free (cls);
-
-  if (rd_count > 0)
-  {
-    printf ("Ego already has a DID Document. Abort.\n");
-    cls_record_store_cb->cb (GNUNET_NO, cls_record_store_cb->cls);
-  }
-  else {
-    // Get public key
-    GNUNET_CRYPTO_key_get_public (zone, &pkey);
-
-    // If no DID Document is given a default one is created
-    if (did_document != NULL)
-      printf (
-        "DID Docuement is read from \"DID-document\" argument (EXPERIMENTAL)\n");
-    else
-      did_document = DID_pkey_to_did_document (&pkey);
-
-    // Create record
-    record_data.data = did_document;
-    record_data.expiration_time = expire_time.rel_value_us;
-    record_data.data_size = strlen (did_document) + 1;
-    record_data.record_type = GNUNET_GNSRECORD_typename_to_number ("TXT"),
-    record_data.flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-
-    // Store record
-    GNUNET_NAMESTORE_records_store (namestore_handle,
-                                    zone,
-                                    DID_DOCUMENT_LABEL,
-                                    1, // FIXME what if GNUNET_GNS_EMPTY_LABEL_AT has records
-                                    &record_data,
-                                    &DID_create_did_store_cb,
-                                    (void *) cls_record_store_cb);
-  }
-}
-
-/**
- * @brief Creates a DID and saves DID Document in Namestore.
- *
- * @param ego ego for which the DID should be created.
- * @param did_document did_document that should be saved in namestore.
- * If did_document==NULL -> Default DID document is created.
- * @param namestore_handle
- * @param cont callback function
- * @param cls closure
- */
-enum GNUNET_GenericReturnValue
-DID_create (const struct GNUNET_IDENTITY_Ego *ego,
-            const char *did_document,
-            const struct GNUNET_TIME_Relative *expire_time,
-            struct GNUNET_NAMESTORE_Handle *namestore_handle,
-            DID_action_callback *cont,
-            void *cls)
-{
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  // Ego, namestore_handle and cont must be set
-  if ((ego == NULL) || (namestore_handle == NULL) || (cont == NULL))
-    return GNUNET_NO;
-
-  // Check if ego has EdDSA key
-  GNUNET_IDENTITY_ego_get_public_key ((struct GNUNET_IDENTITY_Ego *) ego,
-                                      &pkey);
-  if (ntohl (pkey.type) != GNUNET_GNSRECORD_TYPE_EDKEY)
-  {
-    printf ("The EGO has to have an EdDSA key pair\n");
-    return GNUNET_NO;
-  }
-
-  struct DID_action_return *ret
-    = malloc (sizeof(struct DID_action_return));
-  ret->cb = cont;
-  ret->cls = cls;
-
-  struct DID_create_namestore_lookup_closure *cls_name_store_lookup_cb
-    = malloc (sizeof(struct DID_create_namestore_lookup_closure));
-  cls_name_store_lookup_cb->did_document = did_document;
-  cls_name_store_lookup_cb->expire_time = (*expire_time);
-  cls_name_store_lookup_cb->namestore_handle = namestore_handle;
-  cls_name_store_lookup_cb->ret = ret;
-
-  // Check if ego already has a DID Document
-  GNUNET_NAMESTORE_records_lookup (namestore_handle,
-                                   GNUNET_IDENTITY_ego_get_private_key (ego),
-                                   DID_DOCUMENT_LABEL,
-                                   NULL,
-                                   NULL,
-                                   DID_create_namestore_lookup_cb,
-                                   (void *) cls_name_store_lookup_cb);
-
-  return GNUNET_OK;
-}
diff --git a/src/reclaim/did_core.h b/src/reclaim/did_core.h
deleted file mode 100644
index 842424e14..000000000
--- a/src/reclaim/did_core.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/did_core.h
- * @brief Core functionality for GNUNET Decentralized Identifier
- * @author Tristan Schwieren
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "gnunet_identity_service.h"
-#include "did_helper.h"
-#include "jansson.h"
-
-// #define DID_DOCUMENT_LABEL GNUNET_GNS_EMPTY_LABEL_AT
-#define DID_DOCUMENT_LABEL "didd"
-#define DID_DOCUMENT_DEFAULT_EXPIRATION_TIME "365d"
-
-/**
- * @brief Signature of a callback function that is called after a did has been resolved.
- * did_document contains an Error message if DID can not be resolved.
- * Calls the given callback function with the resolved DID Document and the given closure.
- * If the did can not be resolved did_document is NULL.
- * @param status Equals GNUNET_OK if DID Docuemnt has been resolved
- * @param did_document resolved DID Document
- * @param cls previsouly given closure
- */
-typedef void
-  DID_resolve_callback (enum GNUNET_GenericReturnValue status, char *did_document, void *cls);
-
-/**
- * @brief Signature of a callback function that is called after a did has been removed
- * status = 0 if action was sucessfull
- * status = 1 if action failed
- *
- * @param status status of the perfermormed action.
- * @param cls previsouly given closure
- */
-typedef void
-  DID_action_callback (enum GNUNET_GenericReturnValue status, void *cls);
-
-
-/**
- * @brief Resolve a DID.
- * Calls the given callback function with the resolved DID Document and the given closure.
- * If the did can not be resolved did_document is NULL.
- *
- * @param did DID that is resolved
- * @param gns_handle pointer to gns handle.
- * @param cont callback function
- * @param cls closure
- */
-enum GNUNET_GenericReturnValue
-DID_resolve (const char *did,
-             struct GNUNET_GNS_Handle *gns_handle,
-             DID_resolve_callback *cont,
-             void *cls);
-
-
-/**
- * @brief Removes the DID Document from namestore.
- * Ego is not removed.
- * Calls the callback function with status and the given closure.
- *
- * @param ego ego which controlls the DID
- * @param cfg_handle pointer to configuration handle
- * @param namestore_handle pointer to namestore handle
- * @param cont callback function
- * @param cls closure
- */
-enum GNUNET_GenericReturnValue
-DID_remove (const struct GNUNET_IDENTITY_Ego *ego,
-            struct GNUNET_CONFIGURATION_Handle *cfg_handle,
-            struct GNUNET_NAMESTORE_Handle *namestore_handle,
-            DID_action_callback *cont,
-            void *cls);
-
-
-/**
- * @brief Creates a DID and saves DID Document in Namestore.
- *
- * @param ego ego for which the DID should be created.
- * @param did_document did_document that should be saved in namestore.
- * If did_document==NULL -> Default DID document is created.
- * @param expire_time 
- * @param namestore_handle
- * @param cont callback function
- * @param cls closure
- */
-enum GNUNET_GenericReturnValue
-DID_create (const struct GNUNET_IDENTITY_Ego *ego,
-            const char *did_document,
-            const struct GNUNET_TIME_Relative *expire_time,
-            struct GNUNET_NAMESTORE_Handle *namestore_handle,
-            DID_action_callback *cont,
-            void *cls);
-
-
-/**
- * @brief Replace the DID Document of a DID.
- *
- * @param ego ego for which the DID Document should be replaced
- * @param did_document new DID Document
- * @param cfg_handle pointer to configuration handle
- * @param identity_handle pointer to configuration handle
- * @param namestore_handle pointer to namestore handle
- * @param cont callback function
- * @param cls closure
- */
-enum GNUNET_GenericReturnValue
-DID_replace (struct GNUNET_IDENTITY_Ego *ego,
-             char *did_document,
-             const struct GNUNET_CONFIGURATION_Handle *cfg_handle,
-             struct GNUNET_IDENTITY_Handle *identity_handle,
-             struct GNUNET_NAMESTORE_Handle *namestore_handle,
-             DID_action_callback *cont,
-             void *cls);
diff --git a/src/reclaim/did_helper.c b/src/reclaim/did_helper.c
deleted file mode 100644
index 3aac027ee..000000000
--- a/src/reclaim/did_helper.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/did_helper.c
- * @brief helper library for DID related functions
- * @author Tristan Schwieren
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "did_helper.h"
-#include "jansson.h"
-
-#define STR_INDIR(x) #x
-#define STR(x) STR_INDIR (x)
-
-/**
- * @brief Generate a DID for a given GNUNET public key
- *
- * @param pkey
- * @return char* Returns the DID. Caller must free
- * TODO: Check if EdDSA
- */
-char*
-DID_pkey_to_did (struct GNUNET_CRYPTO_PublicKey *pkey)
-{
-  char *pkey_str;
-  char *did_str;
-
-  pkey_str = GNUNET_CRYPTO_public_key_to_string (pkey);
-  GNUNET_asprintf (&did_str, "%s%s",
-                   GNUNET_DID_METHOD_PREFIX,
-                   pkey_str);
-
-  GNUNET_free (pkey_str);
-  return did_str;
-}
-
-/**
- * @brief Generate a DID for a given gnunet EGO.
- * Wrapper around GNUNET_DID_pkey_to_did
- *
- * @param ego
- * @return char* Returns the DID. Caller must free
- */
-char*
-DID_identity_to_did (struct GNUNET_IDENTITY_Ego *ego)
-{
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
-  return DID_pkey_to_did (&pkey);
-}
-
-/**
- * @brief Return the public key of a DID
- */
-enum GNUNET_GenericReturnValue
-DID_did_to_pkey (const char *did, struct GNUNET_CRYPTO_PublicKey *pkey)
-{
-  char pkey_str[MAX_DID_SPECIFIC_IDENTIFIER_LENGTH + 1]; /* 0-term */
-
-  if ((1 != (sscanf (did,
-                     GNUNET_DID_METHOD_PREFIX "%"
-                     STR (MAX_DID_SPECIFIC_IDENTIFIER_LENGTH)
-                     "s", pkey_str))) ||
-      (GNUNET_OK != GNUNET_CRYPTO_public_key_from_string (pkey_str, pkey)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not decode given DID: %s\n",
-                did);
-    return GNUNET_NO;
-  }
-
-  return GNUNET_OK;
-}
-
-/**
- * @brief Convert a base 64 encoded public key to a GNUNET key
- */
-struct GNUNET_CRYPTO_PublicKey *
-GNUNET_DID_key_convert_multibase_base64_to_gnunet (char *pkey_str)
-{
-  return NULL;
-}
-
-/**
- * @brief Convert GNUNET key to a base 64 encoded public key
- */
-char *
-DID_key_convert_gnunet_to_multibase_base64 (struct
-                                           GNUNET_CRYPTO_PublicKey *
-                                           pkey)
-{
-  struct GNUNET_CRYPTO_EddsaPublicKey pubkey = pkey->eddsa_key;
-
-  // This is how to convert out pubkeys to W3c Ed25519-2020 multibase (base64url no padding)
-  char *pkey_base_64;
-  char *pkey_multibase;
-  char pkx[34];
-
-  pkx[0] = 0xed;
-  pkx[1] = 0x01;
-  memcpy (pkx + 2, &pubkey, sizeof (pubkey));
-  GNUNET_STRINGS_base64url_encode (pkx, sizeof (pkx), &pkey_base_64);
-  GNUNET_asprintf (&pkey_multibase, "u%s", pkey_base_64);
-
-  GNUNET_free (pkey_base_64);
-  return pkey_multibase;
-}
-
-/**
- * @brief Create a did generate did object
- *
- * @param pkey
- * @return void* Return pointer to the DID Document
- */
-char *
-DID_pkey_to_did_document (struct GNUNET_CRYPTO_PublicKey *pkey)
-{
-
-  /* FIXME-MSC: This is effectively creating a DID Document default template for
-   * the initial document.
-   * Maybe this can be refactored to generate such a template for an identity?
-   * Even if higher layers add/modify it, there should probably still be a
-   * GNUNET_DID_document_template_from_identity()
-   */
-
-  char *did_str;
-  char *verify_id_str;
-  char *pkey_multibase_str;
-  char *didd_str;
-  json_t *didd_json;
-
-  did_str = DID_pkey_to_did (pkey);
-  GNUNET_asprintf (&verify_id_str, "%s#key-1", did_str);
-
-  pkey_multibase_str = DID_key_convert_gnunet_to_multibase_base64 (pkey);
-
-  didd_json = json_pack (
-    "{s:[ss], s:s, s:[{s:s, s:s, s:s, s:s}], s:[s], s:[s]}",
-    "@context",
-    "https://www.w3.org/ns/did/v1",
-    "https://w3id.org/security/suites/ed25519-2020/v1",
-    "id",
-    did_str,
-    "verificationMethod",
-    "id",
-    verify_id_str,
-    "type",
-    "Ed25519VerificationKey2020",
-    "controller",
-    did_str,
-    "publicKeyMultibase",
-    pkey_multibase_str,
-    "authentication",
-    "#key-1",
-    "assertionMethod",
-    "#key-1");
-
-  // Encode DID Document as JSON string
-  didd_str = json_dumps (didd_json, JSON_INDENT (2));
-
-  // Free
-  GNUNET_free (did_str);
-  GNUNET_free (verify_id_str);
-  GNUNET_free (pkey_multibase_str);
-  json_decref (didd_json);
-
-  return didd_str;
-}
-
-/**
- * @brief Generate the default DID document for a GNUNET ego
- * Wrapper around GNUNET_DID_pkey_to_did_document
- */
-char *
-DID_identity_to_did_document (struct GNUNET_IDENTITY_Ego *ego)
-{
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
-  return DID_pkey_to_did (&pkey);
-}
\ No newline at end of file
diff --git a/src/reclaim/did_helper.h b/src/reclaim/did_helper.h
deleted file mode 100644
index d61992c68..000000000
--- a/src/reclaim/did_helper.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/did_helper.h
- * @brief helper library for DID related functions
- * @author Tristan Schwieren
- */
-
-#define GNUNET_DID_METHOD_PREFIX "did:gns:"
-#define MAX_DID_SPECIFIC_IDENTIFIER_LENGTH 59
-
-/**
- * @brief Return a DID for a given GNUNET public key
- */
-char *
-DID_pkey_to_did (struct GNUNET_CRYPTO_PublicKey *pkey);
-
-/**
- * @brief Generate a DID for a given gnunet EGO
- *
- * @param ego
- * @return char * Returns the DID. Caller must free
- */
-char *
-DID_identity_to_did (struct GNUNET_IDENTITY_Ego *ego);
-
-/**
- * @brief Return the public key of a DID
- */
-enum GNUNET_GenericReturnValue
-DID_did_to_pkey (const char *did, struct GNUNET_CRYPTO_PublicKey *pkey);
-
-// /**
-//  * @brief Convert a base 64 encoded public key to a GNUNET key
-//  */
-// struct GNUNET_CRYPTO_PublicKey *
-// GNUNET_DID_key_convert_multibase_base64_to_gnunet(char *);
-
-/**
- * @brief Convert GNUNET key to a base 64 encoded public key
- */
-char *
-DID_key_convert_gnunet_to_multibase_base64 (struct
-                                                  GNUNET_CRYPTO_PublicKey *);
-
-/**
- * @brief Generate the default DID document for a GNUNET public key
- */
-char *
-DID_pkey_to_did_document (struct GNUNET_CRYPTO_PublicKey *pkey);
-
-/**
- * @brief Generate the default DID document for a GNUNET ego
- */
-char *
-DID_identity_to_did_document (struct GNUNET_IDENTITY_Ego *ego);
diff --git a/src/reclaim/did_misc.c b/src/reclaim/did_misc.c
deleted file mode 100644
index 32b127b2b..000000000
--- a/src/reclaim/did_misc.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2022 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author Martin Schanzenbach
- * @file src/reclaim/did_misc.c
- * @brief Helper functions for DIDs
- *
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
-#include "jansson.h"
-#include "did.h"
-
-char*
-DID_ego_to_did (struct GNUNET_IDENTITY_Ego *ego)
-{
-  struct GNUNET_CRYPTO_PublicKey pkey; // Get Public key
-  char *pkey_str;
-  char *did_str;
-  size_t pkey_len;
-
-  GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
-
-  pkey_str = GNUNET_CRYPTO_public_key_to_string (&pkey);
-  GNUNET_asprintf (&did_str, "%s%s",
-                   GNUNET_RECLAIM_DID_METHOD_PREFIX,
-                   pkey_str);
-
-  GNUNET_free (pkey_str);
-  return did_str;
-}
-
-enum GNUNET_GenericReturnValue
-DID_public_key_from_did (const char* did,
-                         struct GNUNET_CRYPTO_PublicKey *pk)
-{
-  /* FIXME-MSC: I suggest introducing a
-   * #define MAX_DID_LENGTH <something>
-   * here and use it for parsing
-   */
-  char pkey_str[59];
-
-  if ((1 != (sscanf (did, GNUNET_RECLAIM_DID_METHOD_PREFIX"%58s", pkey_str))) ||
-      (GNUNET_OK != GNUNET_CRYPTO_public_key_from_string (pkey_str, pk)))
-  {
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
diff --git a/src/reclaim/gnunet-did.c b/src/reclaim/gnunet-did.c
deleted file mode 100644
index e88a3671e..000000000
--- a/src/reclaim/gnunet-did.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2022 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * FIXME: Do we only want to handle EdDSA identities?
- * TODO: Own GNS record type
- * TODO: Fix overwrite of records in @ if present look for other with same sub
- * TODO. Tests
- * TODO: Move constants to did.h
- * FIXME: Remove and lookup require differnt representations (did vs egoname)
- */
-
-/**
- * @author Tristan Schwieren
- * @file src/did/gnunet-did.c
- * @brief DID Method Wrapper
- *
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "did_helper.h"
-#include "did_core.h"
-#include "jansson.h"
-
-#define GNUNET_DID_DEFAULT_DID_DOCUMENT_EXPIRATION_TIME "1d"
-
-/**
- * return value
- */
-static int ret;
-
-/**
- * Replace DID Document Flag
- */
-static int replace;
-
-/**
- * Remove DID Document Flag
- */
-static int remove_did;
-
-/**
- *  Get DID Documement for DID Flag
- */
-static int get;
-
-/**
- * Create DID Document Flag
- */
-static int create;
-
-/**
- * Show DID for Ego Flag
- */
-static int show;
-
-/**
- * Show DID for Ego Flag
- */
-static int show_all;
-
-/**
- * DID Attribut String
- */
-static char *did;
-
-/**
- * DID Document Attribut String
- */
-static char *didd;
-
-/**
- * Ego Attribut String
- */
-static char *egoname;
-
-/**
- * DID Document expiration Date Attribut String
- */
-static char *expire;
-
-/*
- * Handle to the GNS service
- */
-static struct GNUNET_GNS_Handle *gns_handle;
-
-/*
- * Handle to the NAMESTORE service
- */
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-/*
- * Handle to the IDENTITY service
- */
-static struct GNUNET_IDENTITY_Handle *identity_handle;
-
-
-/*
- * The configuration
- */
-const static struct GNUNET_CONFIGURATION_Handle *my_cfg;
-
-/**
- * Give ego exists
- */
-static int ego_exists = 0;
-
-/**
- * @brief Disconnect and shutdown
- * @param cls closure
- */
-static void
-cleanup (void *cls)
-{
-  if (NULL != gns_handle)
-    GNUNET_GNS_disconnect (gns_handle);
-  if (NULL != namestore_handle)
-    GNUNET_NAMESTORE_disconnect (namestore_handle);
-  if (NULL != identity_handle)
-    GNUNET_IDENTITY_disconnect (identity_handle);
-
-  GNUNET_free (did);
-  GNUNET_free (didd);
-  GNUNET_free (egoname);
-  GNUNET_free (expire);
-
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-/**
- * @brief GNS lookup callback. Prints the DID Document to standard out.
- * Fails if there is more than one DID record.
- *
- * @param cls closure
- * @param rd_count number of records in @a rd
- * @param rd the records in the reply
- */
-static void
-print_did_document (
-  enum GNUNET_GenericReturnValue status,
-  char *did_document,
-  void *cls
-  )
-{
-  if (GNUNET_OK == status)
-    printf ("%s\n", did_document);
-  else
-    printf ("An error occured: %s\n", did_document);
-
-  GNUNET_SCHEDULER_add_now (cleanup, NULL);
-  ret = 0;
-  return;
-}
-
-/**
- * @brief Resolve a DID given by the user.
- */
-static void
-resolve_did ()
-{
-
-  if (did == NULL)
-  {
-    printf ("Set DID option to resolve DID\n");
-    GNUNET_SCHEDULER_add_now (cleanup, NULL);
-    ret = 1;
-    return;
-  }
-
-  if (GNUNET_OK != DID_resolve (did, gns_handle, print_did_document, NULL))
-  {
-    printf ("An error occured while resoling the DID\n");
-    GNUNET_SCHEDULER_add_now (cleanup, NULL);
-    ret = 0;
-    return;
-  }
-}
-
-
-/**
- * @brief Signature of a callback function that is called after a did has been removed
- */
-typedef void
-(*remove_did_document_callback) (void *cls);
-
-/**
- * @brief A Structure containing a cont and cls. Can be passed as a cls to a callback function
- *
- */
-struct Event
-{
-  remove_did_document_callback cont;
-  void *cls;
-};
-
-/**
- * @brief Implements the GNUNET_NAMESTORE_ContinuationWithStatus
- * Calls the callback function and cls in the event struct
- *
- * @param cls closure containing the event struct
- * @param success
- * @param emgs
- */
-static void
-remove_did_document_namestore_cb (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct Event *event;
-
-  if (GNUNET_EC_NONE == ec)
-  {
-    event = (struct Event *) cls;
-
-    if (event->cont != NULL)
-    {
-      event->cont (event->cls);
-      free (event);
-    }
-    else {
-      free (event);
-      GNUNET_SCHEDULER_add_now (cleanup, NULL);
-      ret = 0;
-      return;
-    }
-  }
-  else {
-    printf ("Something went wrong when deleting the DID Document\n");
-
-    printf ("%s\n", GNUNET_ErrorCode_get_hint (ec));
-
-    GNUNET_SCHEDULER_add_now (cleanup, NULL);
-    ret = 0;
-    return;
-  }
-}
-
-/**
- * @brief Callback called after the ego has been locked up
- *
- * @param cls closure
- * @param ego the ego returned by the identity service
- */
-static void
-remove_did_document_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *skey =
-    GNUNET_IDENTITY_ego_get_private_key (ego);
-
-  GNUNET_NAMESTORE_records_store (namestore_handle,
-                                  skey,
-                                  GNUNET_GNS_EMPTY_LABEL_AT,
-                                  0,
-                                  NULL,
-                                  &remove_did_document_namestore_cb,
-                                  cls);
-}
-
-/**
- * @brief Remove a DID Document
- */
-static void
-remove_did_document (remove_did_document_callback cont, void *cls)
-{
-  struct Event *event;
-
-  if (egoname == NULL)
-  {
-    printf ("Remove requieres an ego option\n");
-    GNUNET_SCHEDULER_add_now (cleanup, NULL);
-    ret = 1;
-    return;
-  }
-  else {
-    event = malloc (sizeof(*event));
-    event->cont = cont;
-    event->cls = cls;
-
-    GNUNET_IDENTITY_ego_lookup (my_cfg,
-                                egoname,
-                                &remove_did_document_ego_lookup_cb,
-                                (void *) event);
-  }
-}
-
-// Needed because create_did_ego_lookup_cb() and
-// create_did_ego_create_cb() can call each other
-static void create_did_ego_lockup_cb ();
-
-/**
- * @brief Create a DID(-Document). Called after DID has been created
- * Prints status and the DID.
- *
- */
-static void
-create_did_cb (enum GNUNET_GenericReturnValue status, void *cls)
-{
-  if (GNUNET_OK == status)
-  {
-    printf ("DID has been created.\n%s\n", (char *) cls);
-    free (cls);
-    ret = 0;
-  }
-  else
-  {
-    printf ("An error occured while creating the DID.\n");
-    ret = 1;
-  }
-
-  GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-  return;
-}
-
-/**
- * @brief Create a DID(-Document) - Called after a new Identity has been created.
- */
-static void
-create_did_ego_create_cb (void *cls,
-                          const struct GNUNET_CRYPTO_PrivateKey *pk,
-                          enum GNUNET_ErrorCode ec)
-{
-  if (GNUNET_EC_NONE != ec)
-  {
-    printf ("%s\n", GNUNET_ErrorCode_get_hint (ec));
-    GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-    ret = 1;
-    return;
-  }
-
-  GNUNET_IDENTITY_ego_lookup (my_cfg,
-                              egoname,
-                              &create_did_ego_lockup_cb,
-                              NULL);
-}
-
-/**
- * @brief Create a DID(-Document). Called after ego lookup
- *
- */
-static void
-create_did_ego_lockup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
-{
-  if (ego == NULL)
-  {
-    // If Ego was not found. Create new one first
-    printf ("Ego was not found. Creating new one.\n");
-    GNUNET_IDENTITY_create (identity_handle,
-                            egoname,
-                            NULL,
-                            GNUNET_PUBLIC_KEY_TYPE_EDDSA,
-                            &create_did_ego_create_cb,
-                            egoname);
-  }
-  else
-  {
-    char *did = DID_identity_to_did (ego);
-    void *cls = malloc (strlen (did) + 1);
-    struct GNUNET_TIME_Relative expire_relative;
-
-    if (expire == NULL)
-    {
-      GNUNET_STRINGS_fancy_time_to_relative (
-        DID_DOCUMENT_DEFAULT_EXPIRATION_TIME, &expire_relative);
-    }
-    else if (GNUNET_OK != GNUNET_STRINGS_fancy_time_to_relative (expire,
-                                                                 &
-                                                                 expire_relative))
-    {
-      printf ("Failed to read given expiration time\n");
-      GNUNET_SCHEDULER_add_now (cleanup, NULL);
-      ret = 1;
-      return;
-    }
-
-    strcpy (cls, did);
-    // TODO: Add DID_document argument
-    if (GNUNET_OK != DID_create (ego,
-                                 NULL,
-                                 &expire_relative,
-                                 namestore_handle,
-                                 create_did_cb,
-                                 cls))
-    {
-      printf ("An error occured while creating the DID.\n");
-      ret = 1;
-      GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-      return;
-    }
-  }
-}
-
-/**
- * @brief Create a DID(-Document).
- *
- */
-static void
-create_did ()
-{
-  // Ego name to be set
-  if (egoname == NULL)
-  {
-    printf ("Set the Ego argument to create a new DID(-Document)\n");
-    GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-    ret = 1;
-    return;
-  }
-
-  GNUNET_IDENTITY_ego_lookup (my_cfg,
-                              egoname,
-                              &create_did_ego_lockup_cb,
-                              NULL);
-}
-
-
-/**
- * @brief Replace a DID Docuemnt. Callback function after ego lockup
- *
- * @param cls
- * @param ego
- */
-static void
-replace_did_document_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
-{
-  // create_did_store (didd, ego);
-}
-
-/**
- * @brief Replace a DID Document. Callback functiona after remove
- *
- * @param cls
- */
-static void
-replace_did_document_remove_cb (void *cls)
-{
-  GNUNET_IDENTITY_ego_lookup (my_cfg,
-                              egoname,
-                              &replace_did_document_ego_lookup_cb,
-                              NULL);
-}
-
-/**
- * @brief Replace a DID Docuemnt
- *
- */
-static void
-replace_did_document ()
-{
-  if ((didd != NULL) && (expire != NULL))
-  {
-    remove_did_document (&replace_did_document_remove_cb, NULL);
-  }
-  else {
-    printf (
-      "Set the DID Document and expiration time argument to replace the DID Document\n");
-    GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-    ret = 1;
-    return;
-  }
-}
-
-static void
-post_ego_iteration (void *cls)
-{
-  // TODO: Check that only one argument is set
-
-  if (1 == replace)
-  {
-    replace_did_document ();
-  }
-  else if (1 == get)
-  {
-    resolve_did ();
-  }
-  else if (1 == remove_did)
-  {
-    remove_did_document (NULL, NULL);
-  }
-  else if (1 == create)
-  {
-    create_did ();
-  }
-  else {
-    // No Argument found
-    GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-    return;
-  }
-}
-
-static void
-process_dids (void *cls, struct GNUNET_IDENTITY_Ego *ego,
-              void **ctx, const char*name)
-{
-  char *did_str;
-
-  if (ego == NULL)
-  {
-    if (1 == ego_exists)
-    {
-      GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-      return;
-    }
-    GNUNET_SCHEDULER_add_now (&post_ego_iteration, NULL);
-    return;
-  }
-
-  if (1 == show_all)
-  {
-    did_str = DID_identity_to_did (ego);
-    printf ("%s:\n\t%s\n", name, did_str);
-    GNUNET_free (did_str);
-    return;
-  }
-  if (1 == show)
-  {
-    if (0 == strncmp (name, egoname, strlen (egoname)))
-    {
-      did_str = DID_identity_to_did (ego);
-      printf ("%s:\n\t%s\n", name, did_str);
-      GNUNET_free (did_str);
-      return;
-    }
-  }
-}
-
-
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  gns_handle = GNUNET_GNS_connect (c);
-  namestore_handle = GNUNET_NAMESTORE_connect (c);
-  my_cfg = c;
-
-  // check if GNS_handle could connect
-  if (gns_handle == NULL)
-  {
-    ret = 1;
-    return;
-  }
-
-  // check if NAMESTORE_handle could connect
-  if (namestore_handle == NULL)
-  {
-    GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-    ret = 1;
-    return;
-  }
-
-  identity_handle = GNUNET_IDENTITY_connect (c, &process_dids, NULL);
-  if (identity_handle == NULL)
-  {
-    GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-    ret = 1;
-    return;
-  }
-}
-
-int
-main (int argc, char *const argv[])
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_flag ('C',
-                               "create",
-                               gettext_noop (
-                                 "Create a DID Document and display its DID"),
-                               &create),
-    GNUNET_GETOPT_option_flag ('g',
-                               "get",
-                               gettext_noop (
-                                 "Get the DID Document associated with the given DID"),
-                               &get),
-    GNUNET_GETOPT_option_flag ('r',
-                               "remove",
-                               gettext_noop (
-                                 "Remove the DID"),
-                               &remove_did),
-    GNUNET_GETOPT_option_flag ('R',
-                               "replace",
-                               gettext_noop ("Replace the DID Document."),
-                               &replace),
-    GNUNET_GETOPT_option_flag ('s',
-                               "show",
-                               gettext_noop ("Show the DID for a given ego"),
-                               &show),
-    GNUNET_GETOPT_option_flag ('A',
-                               "show-all",
-                               gettext_noop ("Show egos with DIDs"),
-                               &show_all),
-    GNUNET_GETOPT_option_string ('d',
-                                 "did",
-                                 "DID",
-                                 gettext_noop (
-                                   "The Decentralized Identity (DID)"),
-                                 &did),
-    GNUNET_GETOPT_option_string ('D',
-                                 "did-document",
-                                 "JSON",
-                                 gettext_noop (
-                                   "The DID Document to store in GNUNET"),
-                                 &didd),
-    GNUNET_GETOPT_option_string ('e',
-                                 "ego",
-                                 "EGO",
-                                 gettext_noop ("The name of the EGO"),
-                                 &egoname),
-    GNUNET_GETOPT_option_string ('t',
-                                 "expiration-time",
-                                 "TIME",
-                                 gettext_noop (
-                                   "The time until the DID Document is going to expire (e.g. 5d)"),
-                                 &expire),
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
-                                       argv,
-                                       "gnunet-did",
-                                       "Manage Decentralized Identities (DIDs)",
-                                       options,
-                                       &run,
-                                       NULL))
-    return 1;
-  else
-    return ret;
-}
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
deleted file mode 100644
index efb2c2902..000000000
--- a/src/reclaim/gnunet-reclaim.c
+++ /dev/null
@@ -1,928 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @file src/reclaim/gnunet-reclaim.c
- * @brief Identity Provider utility
- *
- */
-#include "platform.h"
-#include <inttypes.h>
-
-#include "gnunet_util_lib.h"
-
-#include "gnunet_identity_service.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_signatures.h"
-/**
- * return value
- */
-static int ret;
-
-/**
- * List attribute flag
- */
-static int list;
-
-/**
- * List credentials flag
- */
-static int list_credentials;
-
-/**
- * Credential ID string
- */
-static char *credential_id;
-
-/**
- * Credential ID
- */
-static struct GNUNET_RECLAIM_Identifier credential;
-
-/**
- * Credential name
- */
-static char *credential_name;
-
-/**
- * Credential type
- */
-static char *credential_type;
-
-/**
- * Credential exists
- */
-static int credential_exists;
-
-/**
- * Relying party
- */
-static char *rp;
-
-/**
- * The attribute
- */
-static char *attr_name;
-
-/**
- * Attribute value
- */
-static char *attr_value;
-
-/**
- * Attributes to issue
- */
-static char *issue_attrs;
-
-/**
- * Ticket to consume
- */
-static char *consume_ticket;
-
-/**
- * Attribute type
- */
-static char *type_str;
-
-/**
- * Ticket to revoke
- */
-static char *revoke_ticket;
-
-/**
- * Ticket listing
- */
-static int list_tickets;
-
-/**
- * Ego name
- */
-static char *ego_name;
-
-/**
- * Identity handle
- */
-static struct GNUNET_IDENTITY_Handle *identity_handle;
-
-/**
- * reclaim handle
- */
-static struct GNUNET_RECLAIM_Handle *reclaim_handle;
-
-/**
- * reclaim operation
- */
-static struct GNUNET_RECLAIM_Operation *reclaim_op;
-
-/**
- * Attribute iterator
- */
-static struct GNUNET_RECLAIM_AttributeIterator *attr_iterator;
-
-/**
- * Credential iterator
- */
-static struct GNUNET_RECLAIM_CredentialIterator *cred_iterator;
-
-
-/**
- * Ticket iterator
- */
-static struct GNUNET_RECLAIM_TicketIterator *ticket_iterator;
-
-
-/**
- * ego private key
- */
-static const struct GNUNET_CRYPTO_PrivateKey *pkey;
-
-/**
- * rp public key
- */
-static struct GNUNET_CRYPTO_PublicKey rp_key;
-
-/**
- * Ticket to consume
- */
-static struct GNUNET_RECLAIM_Ticket ticket;
-
-/**
- * Attribute list
- */
-static struct GNUNET_RECLAIM_AttributeList *attr_list;
-
-/**
- * Attribute expiration interval
- */
-static struct GNUNET_TIME_Relative exp_interval;
-
-/**
- * Timeout task
- */
-static struct GNUNET_SCHEDULER_Task *timeout;
-
-/**
- * Cleanup task
- */
-static struct GNUNET_SCHEDULER_Task *cleanup_task;
-
-/**
- * Claim to store
- */
-struct GNUNET_RECLAIM_Attribute *claim;
-
-/**
- * Claim to delete
- */
-static char *attr_delete;
-
-/**
- * Claim object to delete
- */
-static struct GNUNET_RECLAIM_Attribute *attr_to_delete;
-
-static void
-do_cleanup (void *cls)
-{
-  cleanup_task = NULL;
-  if (NULL != timeout)
-    GNUNET_SCHEDULER_cancel (timeout);
-  if (NULL != reclaim_op)
-    GNUNET_RECLAIM_cancel (reclaim_op);
-  if (NULL != attr_iterator)
-    GNUNET_RECLAIM_get_attributes_stop (attr_iterator);
-  if (NULL != cred_iterator)
-    GNUNET_RECLAIM_get_credentials_stop (cred_iterator);
-  if (NULL != ticket_iterator)
-    GNUNET_RECLAIM_ticket_iteration_stop (ticket_iterator);
-  if (NULL != reclaim_handle)
-    GNUNET_RECLAIM_disconnect (reclaim_handle);
-  if (NULL != identity_handle)
-    GNUNET_IDENTITY_disconnect (identity_handle);
-  if (NULL != attr_list)
-  {
-    GNUNET_RECLAIM_attribute_list_destroy (attr_list);
-    attr_list = NULL;
-  }
-  if (NULL != attr_to_delete)
-    GNUNET_free (attr_to_delete);
-  if (NULL == credential_type)
-    GNUNET_free (credential_type);
-}
-
-
-static void
-ticket_issue_cb (void *cls,
-                 const struct GNUNET_RECLAIM_Ticket *ticket,
-                 const struct GNUNET_RECLAIM_PresentationList *presentations)
-{
-  char *ticket_str;
-
-  reclaim_op = NULL;
-  if (NULL != ticket)
-  {
-    ticket_str =
-      GNUNET_STRINGS_data_to_string_alloc (ticket,
-                                           sizeof(
-                                             struct GNUNET_RECLAIM_Ticket));
-    printf ("%s\n", ticket_str);
-    GNUNET_free (ticket_str);
-  }
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-store_cont (void *cls, int32_t success, const char *emsg)
-{
-  reclaim_op = NULL;
-  if (GNUNET_SYSERR == success)
-  {
-    fprintf (stderr, "%s\n", emsg);
-  }
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-process_attrs (void *cls,
-               const struct GNUNET_CRYPTO_PublicKey *identity,
-               const struct GNUNET_RECLAIM_Attribute *attr,
-               const struct GNUNET_RECLAIM_Presentation *presentation)
-{
-  char *value_str;
-  char *id;
-  const char *attr_type;
-
-  if (NULL == identity)
-  {
-    reclaim_op = NULL;
-    cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-    return;
-  }
-  if (NULL == attr)
-  {
-    ret = 1;
-    return;
-  }
-  attr_type = GNUNET_RECLAIM_attribute_number_to_typename (attr->type);
-  id = GNUNET_STRINGS_data_to_string_alloc (&attr->id, sizeof(attr->id));
-  value_str = NULL;
-  if (NULL == presentation)
-  {
-    value_str = GNUNET_RECLAIM_attribute_value_to_string (attr->type,
-                                                          attr->data,
-                                                          attr->data_size);
-  }
-  else
-  {
-    struct GNUNET_RECLAIM_AttributeListEntry *ale;
-    struct GNUNET_RECLAIM_AttributeList *al
-      = GNUNET_RECLAIM_presentation_get_attributes (presentation);
-
-    for (ale = al->list_head; NULL != ale; ale = ale->next)
-    {
-      if (0 != strncmp (attr->data, ale->attribute->name, attr->data_size))
-        continue;
-      value_str
-        = GNUNET_RECLAIM_attribute_value_to_string (ale->attribute->type,
-                                                    ale->attribute->data,
-                                                    ale->attribute->data_size);
-      break;
-    }
-  }
-  fprintf (stdout,
-           "Name: %s; Value: %s (%s); Flag %u; ID: %s %s\n",
-           attr->name,
-           (NULL != value_str) ? value_str : "???",
-           attr_type,
-           attr->flag,
-           id,
-           (NULL == presentation) ? "" : "(ATTESTED)");
-  GNUNET_free (value_str);
-  GNUNET_free (id);
-}
-
-
-static void
-ticket_iter_err (void *cls)
-{
-  ticket_iterator = NULL;
-  fprintf (stderr, "Failed to iterate over tickets\n");
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-ticket_iter_fin (void *cls)
-{
-  ticket_iterator = NULL;
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-ticket_iter (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket)
-{
-  char *aud;
-  char *ref;
-  char *tkt;
-
-  aud =
-    GNUNET_STRINGS_data_to_string_alloc (&ticket->audience,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  ref = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd));
-  tkt =
-    GNUNET_STRINGS_data_to_string_alloc (ticket,
-                                         sizeof(struct GNUNET_RECLAIM_Ticket));
-  fprintf (stdout, "Ticket: %s | ID: %s | Audience: %s\n", tkt, ref, aud);
-  GNUNET_free (aud);
-  GNUNET_free (ref);
-  GNUNET_free (tkt);
-  GNUNET_RECLAIM_ticket_iteration_next (ticket_iterator);
-}
-
-
-static void
-iter_error (void *cls)
-{
-  attr_iterator = NULL;
-  cred_iterator = NULL;
-  fprintf (stderr, "Failed\n");
-
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-timeout_task (void *cls)
-{
-  timeout = NULL;
-  ret = 1;
-  fprintf (stderr, "Timeout\n");
-  if (NULL == cleanup_task)
-    cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-process_rvk (void *cls, int success, const char *msg)
-{
-  reclaim_op = NULL;
-  if (GNUNET_OK != success)
-  {
-    fprintf (stderr, "Revocation failed.\n");
-    ret = 1;
-  }
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-process_delete (void *cls, int success, const char *msg)
-{
-  reclaim_op = NULL;
-  if (GNUNET_OK != success)
-  {
-    fprintf (stderr, "Deletion failed.\n");
-    ret = 1;
-  }
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-iter_finished (void *cls)
-{
-  char *data;
-  size_t data_size;
-  int type;
-
-  attr_iterator = NULL;
-  if (list)
-  {
-    cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-    return;
-  }
-
-  if (issue_attrs)
-  {
-    reclaim_op = GNUNET_RECLAIM_ticket_issue (reclaim_handle,
-                                              pkey,
-                                              &rp_key,
-                                              attr_list,
-                                              &ticket_issue_cb,
-                                              NULL);
-    return;
-  }
-  if (consume_ticket)
-  {
-    reclaim_op = GNUNET_RECLAIM_ticket_consume (reclaim_handle,
-                                                pkey,
-                                                &ticket,
-                                                &process_attrs,
-                                                NULL);
-    timeout = GNUNET_SCHEDULER_add_delayed (
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10),
-      &timeout_task,
-      NULL);
-    return;
-  }
-  if (revoke_ticket)
-  {
-    reclaim_op = GNUNET_RECLAIM_ticket_revoke (reclaim_handle,
-                                               pkey,
-                                               &ticket,
-                                               &process_rvk,
-                                               NULL);
-    return;
-  }
-  if (attr_delete)
-  {
-    if (NULL == attr_to_delete)
-    {
-      fprintf (stdout, "No such attribute ``%s''\n", attr_delete);
-      GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-      return;
-    }
-    reclaim_op = GNUNET_RECLAIM_attribute_delete (reclaim_handle,
-                                                  pkey,
-                                                  attr_to_delete,
-                                                  &process_delete,
-                                                  NULL);
-    return;
-  }
-  if (attr_name)
-  {
-    if (NULL == type_str)
-      type = GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING;
-    else
-      type = GNUNET_RECLAIM_attribute_typename_to_number (type_str);
-
-    GNUNET_assert (GNUNET_SYSERR !=
-                   GNUNET_RECLAIM_attribute_string_to_value (type,
-                                                             attr_value,
-                                                             (void **) &data,
-                                                             &data_size));
-    if (NULL != claim)
-    {
-      claim->type = type;
-      claim->data = data;
-      claim->data_size = data_size;
-    }
-    else
-    {
-      claim =
-        GNUNET_RECLAIM_attribute_new (attr_name, NULL, type, data, data_size);
-    }
-    if (NULL != credential_id)
-    {
-      claim->credential = credential;
-    }
-    reclaim_op = GNUNET_RECLAIM_attribute_store (reclaim_handle,
-                                                 pkey,
-                                                 claim,
-                                                 &exp_interval,
-                                                 &store_cont,
-                                                 NULL);
-    GNUNET_free (data);
-    GNUNET_free (claim);
-    return;
-  }
-  cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-}
-
-
-static void
-iter_cb (void *cls,
-         const struct GNUNET_CRYPTO_PublicKey *identity,
-         const struct GNUNET_RECLAIM_Attribute *attr)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  char *attrs_tmp;
-  char *attr_str;
-  char *label;
-  char *id;
-  const char *attr_type;
-
-  if ((NULL != attr_name) && (NULL == claim))
-  {
-    if (0 == strcasecmp (attr_name, attr->name))
-    {
-      claim = GNUNET_RECLAIM_attribute_new (attr->name,
-                                            &attr->credential,
-                                            attr->type,
-                                            attr->data,
-                                            attr->data_size);
-      claim->id = attr->id;
-    }
-  }
-  else if (issue_attrs)
-  {
-    attrs_tmp = GNUNET_strdup (issue_attrs);
-    attr_str = strtok (attrs_tmp, ",");
-    while (NULL != attr_str)
-    {
-      if (0 != strcasecmp (attr_str, attr->name))
-      {
-        attr_str = strtok (NULL, ",");
-        continue;
-      }
-      le = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-      le->attribute = GNUNET_RECLAIM_attribute_new (attr->name,
-                                                    &attr->credential,
-                                                    attr->type,
-                                                    attr->data,
-                                                    attr->data_size);
-      le->attribute->flag = attr->flag;
-      le->attribute->id = attr->id;
-      GNUNET_CONTAINER_DLL_insert (attr_list->list_head,
-                                   attr_list->list_tail,
-                                   le);
-      break;
-    }
-    GNUNET_free (attrs_tmp);
-  }
-  else if (attr_delete && (NULL == attr_to_delete))
-  {
-    label = GNUNET_STRINGS_data_to_string_alloc (&attr->id, sizeof(attr->id));
-    if (0 == strcasecmp (attr_delete, label))
-    {
-      attr_to_delete = GNUNET_RECLAIM_attribute_new (attr->name,
-                                                     &attr->credential,
-                                                     attr->type,
-                                                     attr->data,
-                                                     attr->data_size);
-      attr_to_delete->id = attr->id;
-    }
-    GNUNET_free (label);
-  }
-  else if (list)
-  {
-    attr_str = GNUNET_RECLAIM_attribute_value_to_string (attr->type,
-                                                         attr->data,
-                                                         attr->data_size);
-    attr_type = GNUNET_RECLAIM_attribute_number_to_typename (attr->type);
-    id = GNUNET_STRINGS_data_to_string_alloc (&attr->id, sizeof(attr->id));
-    if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&attr->credential))
-    {
-      fprintf (stdout,
-               "%s: ``%s'' (%s); ID: %s\n",
-               attr->name,
-               attr_str,
-               attr_type,
-               id);
-    }
-    else
-    {
-      char *cred_id =
-        GNUNET_STRINGS_data_to_string_alloc (&attr->credential,
-                                             sizeof(attr->credential));
-      fprintf (stdout,
-               "%s: ``%s'' in credential presentation `%s' (%s); ID: %s\n",
-               attr->name,
-               attr_str,
-               cred_id,
-               attr_type,
-               id);
-      GNUNET_free (cred_id);
-
-    }
-    GNUNET_free (id);
-  }
-  GNUNET_RECLAIM_get_attributes_next (attr_iterator);
-}
-
-
-static void
-cred_iter_finished (void *cls)
-{
-  cred_iterator = NULL;
-
-  // Add new credential
-  if ((NULL != credential_name) &&
-      (NULL != attr_value))
-  {
-    enum GNUNET_RECLAIM_CredentialType ctype =
-      GNUNET_RECLAIM_credential_typename_to_number (credential_type);
-    struct GNUNET_RECLAIM_Credential *credential =
-      GNUNET_RECLAIM_credential_new (credential_name,
-                                     ctype,
-                                     attr_value,
-                                     strlen (attr_value));
-    reclaim_op = GNUNET_RECLAIM_credential_store (reclaim_handle,
-                                                  pkey,
-                                                  credential,
-                                                  &exp_interval,
-                                                  store_cont,
-                                                  NULL);
-    return;
-
-  }
-  if (list_credentials)
-  {
-    cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-    return;
-  }
-  attr_iterator = GNUNET_RECLAIM_get_attributes_start (reclaim_handle,
-                                                       pkey,
-                                                       &iter_error,
-                                                       NULL,
-                                                       &iter_cb,
-                                                       NULL,
-                                                       &iter_finished,
-                                                       NULL);
-
-}
-
-
-static void
-cred_iter_cb (void *cls,
-              const struct GNUNET_CRYPTO_PublicKey *identity,
-              const struct GNUNET_RECLAIM_Credential *cred)
-{
-  char *cred_str;
-  char *attr_str;
-  char *id;
-  const char *cred_type;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-
-  if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (&credential,
-                                                &cred->id))
-    credential_exists = GNUNET_YES;
-  if (list_credentials)
-  {
-    cred_str = GNUNET_RECLAIM_credential_value_to_string (cred->type,
-                                                          cred->data,
-                                                          cred->data_size);
-    cred_type = GNUNET_RECLAIM_credential_number_to_typename (cred->type);
-    id = GNUNET_STRINGS_data_to_string_alloc (&cred->id, sizeof(cred->id));
-    fprintf (stdout,
-             "%s: ``%s'' (%s); ID: %s\n",
-             cred->name,
-             cred_str,
-             cred_type,
-             id);
-    struct GNUNET_RECLAIM_AttributeList *attrs =
-      GNUNET_RECLAIM_credential_get_attributes (cred);
-    if (NULL != attrs)
-    {
-      fprintf (stdout,
-               "\t Attributes:\n");
-      for (ale = attrs->list_head; NULL != ale; ale = ale->next)
-      {
-        attr_str = GNUNET_RECLAIM_attribute_value_to_string (
-          ale->attribute->type,
-          ale->attribute->data,
-          ale->attribute->data_size);
-        fprintf (stdout,
-                 "\t %s: %s\n", ale->attribute->name, attr_str);
-        GNUNET_free (attr_str);
-      }
-      GNUNET_RECLAIM_attribute_list_destroy (attrs);
-    }
-    GNUNET_free (id);
-  }
-  GNUNET_RECLAIM_get_credentials_next (cred_iterator);
-}
-
-
-static void
-start_process ()
-{
-  if (NULL == pkey)
-  {
-    fprintf (stderr, "Ego %s not found\n", ego_name);
-    cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-    return;
-  }
-  if (NULL == credential_type)
-    credential_type = GNUNET_strdup ("JWT");
-  credential = GNUNET_RECLAIM_ID_ZERO;
-  if (NULL != credential_id)
-    GNUNET_STRINGS_string_to_data (credential_id,
-                                   strlen (credential_id),
-                                   &credential, sizeof(credential));
-  credential_exists = GNUNET_NO;
-  if (list_tickets)
-  {
-    ticket_iterator = GNUNET_RECLAIM_ticket_iteration_start (reclaim_handle,
-                                                             pkey,
-                                                             &ticket_iter_err,
-                                                             NULL,
-                                                             &ticket_iter,
-                                                             NULL,
-                                                             &ticket_iter_fin,
-                                                             NULL);
-    return;
-  }
-
-  if ((NULL != rp) &&
-      (GNUNET_OK !=
-       GNUNET_CRYPTO_public_key_from_string (rp, &rp_key)) )
-  {
-    fprintf (stderr, "%s is not a public key!\n", rp);
-    cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-    return;
-  }
-  if (NULL != consume_ticket)
-    GNUNET_STRINGS_string_to_data (consume_ticket,
-                                   strlen (consume_ticket),
-                                   &ticket,
-                                   sizeof(struct GNUNET_RECLAIM_Ticket));
-  if (NULL != revoke_ticket)
-    GNUNET_STRINGS_string_to_data (revoke_ticket,
-                                   strlen (revoke_ticket),
-                                   &ticket,
-                                   sizeof(struct GNUNET_RECLAIM_Ticket));
-
-  attr_list = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  claim = NULL;
-  cred_iterator = GNUNET_RECLAIM_get_credentials_start (reclaim_handle,
-                                                        pkey,
-                                                        &iter_error,
-                                                        NULL,
-                                                        &cred_iter_cb,
-                                                        NULL,
-                                                        &cred_iter_finished,
-                                                        NULL);
-
-}
-
-
-static int init = GNUNET_YES;
-
-static void
-ego_cb (void *cls,
-        struct GNUNET_IDENTITY_Ego *ego,
-        void **ctx,
-        const char *name)
-{
-  if (NULL == name)
-  {
-    if (GNUNET_YES == init)
-    {
-      init = GNUNET_NO;
-      start_process ();
-    }
-    return;
-  }
-  if (0 != strcmp (name, ego_name))
-    return;
-  pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
-}
-
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  ret = 0;
-  if (NULL == ego_name)
-  {
-    ret = 1;
-    fprintf (stderr, _ ("Ego is required\n"));
-    return;
-  }
-
-  if ((NULL == attr_value) && (NULL != attr_name))
-  {
-    ret = 1;
-    fprintf (stderr, _ ("Attribute value missing!\n"));
-    return;
-  }
-
-  if ((NULL == rp) && (NULL != issue_attrs))
-  {
-    ret = 1;
-    fprintf (stderr, _ ("Requesting party key is required!\n"));
-    return;
-  }
-
-  reclaim_handle = GNUNET_RECLAIM_connect (c);
-  // Get Ego
-  identity_handle = GNUNET_IDENTITY_connect (c, &ego_cb, NULL);
-}
-
-
-int
-main (int argc, char *const argv[])
-{
-  exp_interval = GNUNET_TIME_UNIT_HOURS;
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string ('a',
-                                 "add",
-                                 "NAME",
-                                 gettext_noop ("Add or update an attribute NAME"),
-                                 &attr_name),
-    GNUNET_GETOPT_option_string ('d',
-                                 "delete",
-                                 "ID",
-                                 gettext_noop ("Delete the attribute with ID"),
-                                 &attr_delete),
-    GNUNET_GETOPT_option_string ('V',
-                                 "value",
-                                 "VALUE",
-                                 gettext_noop ("The attribute VALUE"),
-                                 &attr_value),
-    GNUNET_GETOPT_option_string ('e',
-                                 "ego",
-                                 "EGO",
-                                 gettext_noop ("The EGO to use"),
-                                 &ego_name),
-    GNUNET_GETOPT_option_string ('r',
-                                 "rp",
-                                 "RP",
-                                 gettext_noop (
-                                   "Specify the relying party for issue"),
-                                 &rp),
-    GNUNET_GETOPT_option_flag ('D',
-                               "dump",
-                               gettext_noop ("List attributes for EGO"),
-                               &list),
-    GNUNET_GETOPT_option_flag ('A',
-                               "credentials",
-                               gettext_noop ("List credentials for EGO"),
-                               &list_credentials),
-    GNUNET_GETOPT_option_string ('I',
-                                 "credential-id",
-                                 "CREDENTIAL_ID",
-                                 gettext_noop (
-                                   "Credential to use for attribute"),
-                                 &credential_id),
-    GNUNET_GETOPT_option_string ('N',
-                                 "credential-name",
-                                 "NAME",
-                                 gettext_noop ("Credential name"),
-                                 &credential_name),
-    GNUNET_GETOPT_option_string ('i',
-                                 "issue",
-                                 "A1,A2,...",
-                                 gettext_noop (
-                                   "Issue a ticket for a set of attributes separated by comma"),
-                                 &issue_attrs),
-    GNUNET_GETOPT_option_string ('C',
-                                 "consume",
-                                 "TICKET",
-                                 gettext_noop ("Consume a ticket"),
-                                 &consume_ticket),
-    GNUNET_GETOPT_option_string ('R',
-                                 "revoke",
-                                 "TICKET",
-                                 gettext_noop ("Revoke a ticket"),
-                                 &revoke_ticket),
-    GNUNET_GETOPT_option_string ('t',
-                                 "type",
-                                 "TYPE",
-                                 gettext_noop ("Type of attribute"),
-                                 &type_str),
-    GNUNET_GETOPT_option_string ('u',
-                                 "credential-type",
-                                 "TYPE",
-                                 gettext_noop ("Type of credential"),
-                                 &credential_type),
-    GNUNET_GETOPT_option_flag ('T',
-                               "tickets",
-                               gettext_noop ("List tickets of ego"),
-                               &list_tickets),
-    GNUNET_GETOPT_option_relative_time ('E',
-                                        "expiration",
-                                        "INTERVAL",
-                                        gettext_noop (
-                                          "Expiration interval of the attribute"),
-                                        &exp_interval),
-
-    GNUNET_GETOPT_OPTION_END
-  };
-  if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
-                                       argv,
-                                       "gnunet-reclaim",
-                                       _ ("re:claimID command line tool"),
-                                       options,
-                                       &run,
-                                       NULL))
-    return 1;
-  else
-    return ret;
-}
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
deleted file mode 100644
index 47a86a3e8..000000000
--- a/src/reclaim/gnunet-service-reclaim.c
+++ /dev/null
@@ -1,2814 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @file src/reclaim/gnunet-service-reclaim.c
- * @brief reclaim Service
- *
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet-service-reclaim_tickets.h"
-#include "gnunet_constants.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_signatures.h"
-#include "reclaim.h"
-
-
-/**
- * Namestore handle
- */
-static struct GNUNET_NAMESTORE_Handle *nsh;
-
-/**
- * Timeout task
- */
-static struct GNUNET_SCHEDULER_Task *timeout_task;
-
-/**
- * Our configuration.
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * An idp client
- */
-struct IdpClient;
-
-/**
- * A ticket iteration operation.
- */
-struct TicketIteration
-{
-  /**
-   * DLL
-   */
-  struct TicketIteration *next;
-
-  /**
-   * DLL
-   */
-  struct TicketIteration *prev;
-
-  /**
-   * Client which intiated this zone iteration
-   */
-  struct IdpClient *client;
-
-  /**
-   * The operation id for the iteration in the response for the client
-   */
-  uint32_t r_id;
-
-  /**
-   * The ticket iterator
-   */
-  struct RECLAIM_TICKETS_Iterator *iter;
-};
-
-
-/**
- * An attribute iteration operation.
- */
-struct Iterator
-{
-  /**
-   * Next element in the DLL
-   */
-  struct Iterator *next;
-
-  /**
-   * Previous element in the DLL
-   */
-  struct Iterator *prev;
-
-  /**
-   * IDP client which intiated this zone iteration
-   */
-  struct IdpClient *client;
-
-  /**
-   * Key of the zone we are iterating over.
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * Namestore iterator
-   */
-  struct GNUNET_NAMESTORE_ZoneIterator *ns_it;
-
-  /**
-   * The operation id for the zone iteration in the response for the client
-   */
-  uint32_t request_id;
-
-  /**
-   * Context
-   */
-  void *ctx;
-};
-
-
-/**
- * An idp client
- */
-struct IdpClient
-{
-  /**
-   * DLL
-   */
-  struct IdpClient *prev;
-
-  /**
-   * DLL
-   */
-  struct IdpClient *next;
-
-  /**
-   * The client
-   */
-  struct GNUNET_SERVICE_Client *client;
-
-  /**
-   * Message queue for transmission to @e client
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Head of the DLL of
-   * Attribute iteration operations in
-   * progress initiated by this client
-   */
-  struct Iterator *attr_iter_head;
-
-  /**
-   * Tail of the DLL of
-   * Attribute iteration operations
-   * in progress initiated by this client
-   */
-  struct Iterator *attr_iter_tail;
-
-  /**
-   * Head of the DLL of
-   * Credential iteration operations in
-   * progress initiated by this client
-   */
-  struct Iterator *cred_iter_head;
-
-  /**
-   * Tail of the DLL of
-   * Credential iteration operations
-   * in progress initiated by this client
-   */
-  struct Iterator *cred_iter_tail;
-
-  /**
-   * Head of DLL of ticket iteration ops
-   */
-  struct TicketIteration *ticket_iter_head;
-
-  /**
-   * Tail of DLL of ticket iteration ops
-   */
-  struct TicketIteration *ticket_iter_tail;
-
-  /**
-   * Head of DLL of ticket revocation ops
-   */
-  struct TicketRevocationOperation *revoke_op_head;
-
-  /**
-   * Tail of DLL of ticket revocation ops
-   */
-  struct TicketRevocationOperation *revoke_op_tail;
-
-  /**
-   * Head of DLL of ticket issue ops
-   */
-  struct TicketIssueOperation *issue_op_head;
-
-  /**
-   * Tail of DLL of ticket issue ops
-   */
-  struct TicketIssueOperation *issue_op_tail;
-
-  /**
-   * Head of DLL of ticket consume ops
-   */
-  struct ConsumeTicketOperation *consume_op_head;
-
-  /**
-   * Tail of DLL of ticket consume ops
-   */
-  struct ConsumeTicketOperation *consume_op_tail;
-
-  /**
-   * Head of DLL of attribute store ops
-   */
-  struct AttributeStoreHandle *store_op_head;
-
-  /**
-   * Tail of DLL of attribute store ops
-   */
-  struct AttributeStoreHandle *store_op_tail;
-  /**
-   * Head of DLL of attribute delete ops
-   */
-  struct AttributeDeleteHandle *delete_op_head;
-
-  /**
-   * Tail of DLL of attribute delete ops
-   */
-  struct AttributeDeleteHandle *delete_op_tail;
-};
-
-
-/**
- * Handle for attribute deletion request
- */
-struct AttributeDeleteHandle
-{
-  /**
-   * DLL
-   */
-  struct AttributeDeleteHandle *next;
-
-  /**
-   * DLL
-   */
-  struct AttributeDeleteHandle *prev;
-
-  /**
-   * Client connection
-   */
-  struct IdpClient *client;
-
-  /**
-   * Identity
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-
-  /**
-   * QueueEntry
-   */
-  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
-
-  /**
-   * Iterator
-   */
-  struct GNUNET_NAMESTORE_ZoneIterator *ns_it;
-
-  /**
-   * The attribute to delete
-   */
-  struct GNUNET_RECLAIM_Attribute *claim;
-
-  /**
-   * The credential to delete
-   */
-  struct GNUNET_RECLAIM_Credential *credential;
-
-  /**
-   * Tickets to update
-   */
-  struct TicketRecordsEntry *tickets_to_update_head;
-
-  /**
-   * Tickets to update
-   */
-  struct TicketRecordsEntry *tickets_to_update_tail;
-
-  /**
-   * Existing attributes
-   */
-  struct GNUNET_RECLAIM_AttributeList *existing_attributes;
-
-  /**
-   * Existing credentials
-   */
-  struct GNUNET_RECLAIM_CredentialList *existing_credentials;
-
-  /**
-   * Attribute label
-   */
-  char *label;
-
-  /**
-   * request id
-   */
-  uint32_t r_id;
-};
-
-
-/**
- * Handle for attribute store request
- */
-struct AttributeStoreHandle
-{
-  /**
-   * DLL
-   */
-  struct AttributeStoreHandle *next;
-
-  /**
-   * DLL
-   */
-  struct AttributeStoreHandle *prev;
-
-  /**
-   * Client connection
-   */
-  struct IdpClient *client;
-
-  /**
-   * Identity
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * Identity pubkey
-   */
-  struct GNUNET_CRYPTO_PublicKey identity_pkey;
-
-  /**
-   * QueueEntry
-   */
-  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
-
-  /**
-   * The attribute to store
-   */
-  struct GNUNET_RECLAIM_Attribute *claim;
-
-  /**
-  * The credential to store
-  */
-  struct GNUNET_RECLAIM_Credential *credential;
-
-  /**
-   * The attribute expiration interval
-   */
-  struct GNUNET_TIME_Relative exp;
-
-  /**
-   * request id
-   */
-  uint32_t r_id;
-};
-
-
-/**
- * Handle for ticket consume request
- */
-struct ConsumeTicketOperation
-{
-  /**
-   * DLL
-   */
-  struct ConsumeTicketOperation *next;
-
-  /**
-   * DLL
-   */
-  struct ConsumeTicketOperation *prev;
-
-  /**
-   * Client connection
-   */
-  struct IdpClient *client;
-
-  /**
-   * request id
-   */
-  uint32_t r_id;
-
-  /**
-   * Ticket consume handle
-   */
-  struct RECLAIM_TICKETS_ConsumeHandle *ch;
-};
-
-
-/**
- * Ticket revocation request handle
- */
-struct TicketRevocationOperation
-{
-  /**
-   * DLL
-   */
-  struct TicketRevocationOperation *prev;
-
-  /**
-   * DLL
-   */
-  struct TicketRevocationOperation *next;
-
-  /**
-   * Client connection
-   */
-  struct IdpClient *client;
-
-  /**
-   * Revocation handle
-   */
-  struct RECLAIM_TICKETS_RevokeHandle *rh;
-
-  /**
-   * request id
-   */
-  uint32_t r_id;
-};
-
-
-/**
- * Ticket issue operation handle
- */
-struct TicketIssueOperation
-{
-  /**
-   * DLL
-   */
-  struct TicketIssueOperation *prev;
-
-  /**
-   * DLL
-   */
-  struct TicketIssueOperation *next;
-
-  /**
-   * Client connection
-   */
-  struct IdpClient *client;
-
-  /**
-   * request id
-   */
-  uint32_t r_id;
-};
-
-
-/**
- * Client list
- */
-static struct IdpClient *client_list_head = NULL;
-
-/**
- * Client list
- */
-static struct IdpClient *client_list_tail = NULL;
-
-
-/**
- * Cleanup attribute delete handle
- *
- * @param adh the attribute to cleanup
- */
-static void
-cleanup_adh (struct AttributeDeleteHandle *adh)
-{
-  struct TicketRecordsEntry *le;
-
-  if (NULL != adh->ns_it)
-    GNUNET_NAMESTORE_zone_iteration_stop (adh->ns_it);
-  if (NULL != adh->ns_qe)
-    GNUNET_NAMESTORE_cancel (adh->ns_qe);
-  if (NULL != adh->label)
-    GNUNET_free (adh->label);
-  if (NULL != adh->claim)
-    GNUNET_free (adh->claim);
-  if (NULL != adh->credential)
-    GNUNET_free (adh->credential);
-  if (NULL != adh->existing_credentials)
-    GNUNET_RECLAIM_credential_list_destroy (adh->existing_credentials);
-  if (NULL != adh->existing_attributes)
-    GNUNET_RECLAIM_attribute_list_destroy (adh->existing_attributes);
-  while (NULL != (le = adh->tickets_to_update_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (adh->tickets_to_update_head,
-                                 adh->tickets_to_update_tail,
-                                 le);
-    if (NULL != le->label)
-      GNUNET_free (le->label);
-    if (NULL != le->data)
-      GNUNET_free (le->data);
-    GNUNET_free (le);
-  }
-  GNUNET_free (adh);
-}
-
-
-/**
- * Cleanup attribute store handle
- *
- * @param ash handle to clean up
- */
-static void
-cleanup_as_handle (struct AttributeStoreHandle *ash)
-{
-  if (NULL != ash->ns_qe)
-    GNUNET_NAMESTORE_cancel (ash->ns_qe);
-  if (NULL != ash->claim)
-    GNUNET_free (ash->claim);
-  if (NULL != ash->credential)
-    GNUNET_free (ash->credential);
-  GNUNET_free (ash);
-}
-
-
-/**
- * Cleanup client
- *
- * @param idp the client to clean up
- */
-static void
-cleanup_client (struct IdpClient *idp)
-{
-  struct Iterator *ai;
-  struct TicketIteration *ti;
-  struct TicketRevocationOperation *rop;
-  struct TicketIssueOperation *iss;
-  struct ConsumeTicketOperation *ct;
-  struct AttributeStoreHandle *as;
-  struct AttributeDeleteHandle *adh;
-
-  while (NULL != (iss = idp->issue_op_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->issue_op_head, idp->issue_op_tail, iss);
-    GNUNET_free (iss);
-  }
-  while (NULL != (ct = idp->consume_op_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->consume_op_head,
-                                 idp->consume_op_tail,
-                                 ct);
-    if (NULL != ct->ch)
-      RECLAIM_TICKETS_consume_cancel (ct->ch);
-    GNUNET_free (ct);
-  }
-  while (NULL != (as = idp->store_op_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->store_op_head, idp->store_op_tail, as);
-    cleanup_as_handle (as);
-  }
-  while (NULL != (adh = idp->delete_op_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->delete_op_head, idp->delete_op_tail, adh);
-    cleanup_adh (adh);
-  }
-
-  while (NULL != (ai = idp->attr_iter_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->attr_iter_head, idp->attr_iter_tail, ai);
-    GNUNET_free (ai);
-  }
-  while (NULL != (ai = idp->cred_iter_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->cred_iter_head, idp->cred_iter_tail,
-                                 ai);
-    GNUNET_free (ai);
-  }
-
-  while (NULL != (rop = idp->revoke_op_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->revoke_op_head, idp->revoke_op_tail, rop);
-    if (NULL != rop->rh)
-      RECLAIM_TICKETS_revoke_cancel (rop->rh);
-    GNUNET_free (rop);
-  }
-  while (NULL != (ti = idp->ticket_iter_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (idp->ticket_iter_head,
-                                 idp->ticket_iter_tail,
-                                 ti);
-    if (NULL != ti->iter)
-      RECLAIM_TICKETS_iteration_stop (ti->iter);
-    GNUNET_free (ti);
-  }
-  GNUNET_free (idp);
-}
-
-
-/**
- * Cleanup task
- */
-static void
-cleanup ()
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
-
-  RECLAIM_TICKETS_deinit ();
-  if (NULL != timeout_task)
-    GNUNET_SCHEDULER_cancel (timeout_task);
-  if (NULL != nsh)
-    GNUNET_NAMESTORE_disconnect (nsh);
-}
-
-
-/**
- * Shutdown task
- *
- * @param cls NULL
- */
-static void
-do_shutdown (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down...\n");
-  cleanup ();
-}
-
-
-/**
- * Sends a ticket result message to the client
- *
- * @param client the client to send to
- * @param r_id the request message ID to reply to
- * @param ticket the ticket to include (may be NULL)
- * @param success the success status of the request
- */
-static void
-send_ticket_result (const struct IdpClient *client,
-                    uint32_t r_id,
-                    const struct GNUNET_RECLAIM_Ticket *ticket,
-                    const struct GNUNET_RECLAIM_PresentationList *presentations,
-                    uint32_t success)
-{
-  struct TicketResultMessage *irm;
-  struct GNUNET_MQ_Envelope *env;
-  size_t pres_len = 0;
-  size_t tkt_len = 0;
-  ssize_t written;
-  char *buf;
-
-  if (NULL != presentations)
-  {
-    pres_len =
-      GNUNET_RECLAIM_presentation_list_serialize_get_size (presentations);
-  }
-  if (NULL != ticket)
-    tkt_len = GNUNET_RECLAIM_ticket_serialize_get_size (ticket);
-  env = GNUNET_MQ_msg_extra (irm,
-                             pres_len + tkt_len,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT);
-  buf = (char*) &irm[1];
-  if (NULL != ticket)
-  {
-    irm->tkt_len = htons (tkt_len);
-    written = GNUNET_RECLAIM_write_ticket_to_buffer (ticket, buf, tkt_len);
-    GNUNET_assert (0 <= written);
-    buf += written;
-  }
-  // TODO add success member
-  irm->id = htonl (r_id);
-  irm->presentations_len = htons (pres_len);
-  if (NULL != presentations)
-  {
-    GNUNET_RECLAIM_presentation_list_serialize (presentations,
-                                                buf);
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending TICKET_RESULT message\n");
-  GNUNET_MQ_send (client->mq, env);
-}
-
-
-/**
- * Issue ticket result
- *
- * @param cls out ticket issue operation handle
- * @param ticket the issued ticket
- * @param presentations newly created credential presentations (NULL on error)
- * @param success issue success status (GNUNET_OK if successful)
- * @param emsg error message (NULL of success is GNUNET_OK)
- */
-static void
-issue_ticket_result_cb (void *cls,
-                        struct GNUNET_RECLAIM_Ticket *ticket,
-                        struct GNUNET_RECLAIM_PresentationList *presentations,
-                        int32_t success,
-                        const char *emsg)
-{
-  struct TicketIssueOperation *tio = cls;
-
-  if (GNUNET_OK != success)
-  {
-    send_ticket_result (tio->client, tio->r_id, NULL, NULL, GNUNET_SYSERR);
-    GNUNET_CONTAINER_DLL_remove (tio->client->issue_op_head,
-                                 tio->client->issue_op_tail,
-                                 tio);
-    GNUNET_free (tio);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error issuing ticket: %s\n", emsg);
-    return;
-  }
-  send_ticket_result (tio->client, tio->r_id,
-                      ticket, presentations, GNUNET_SYSERR);
-  GNUNET_CONTAINER_DLL_remove (tio->client->issue_op_head,
-                               tio->client->issue_op_tail,
-                               tio);
-  GNUNET_free (tio);
-}
-
-
-/**
- * Check issue ticket message
- *
- * @param cls unused
- * @param im message to check
- * @return GNUNET_OK if message is ok
- */
-static int
-check_issue_ticket_message (void *cls, const struct IssueTicketMessage *im)
-{
-  uint16_t size;
-  size_t attrs_len;
-  size_t key_len;
-  size_t pkey_len;
-
-  size = ntohs (im->header.size);
-  attrs_len = ntohs (im->attr_len);
-  key_len = ntohs (im->key_len);
-  pkey_len = ntohs (im->pkey_len);
-  if (size != attrs_len + key_len + pkey_len + sizeof(struct
-                                                      IssueTicketMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle ticket issue message
- *
- * @param cls our client
- * @param im the message
- */
-static void
-handle_issue_ticket_message (void *cls, const struct IssueTicketMessage *im)
-{
-  struct TicketIssueOperation *tio;
-  struct IdpClient *idp = cls;
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  struct GNUNET_CRYPTO_PublicKey rp;
-  size_t attrs_len;
-  size_t key_len;
-  size_t pkey_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received ISSUE_TICKET message\n");
-  key_len = ntohs (im->key_len);
-  buf = (char *) &im[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  pkey_len = ntohs (im->pkey_len);
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_public_key_from_buffer (buf, pkey_len,
-                                                    &rp, &read)) ||
-      (read != pkey_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read public key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  tio = GNUNET_new (struct TicketIssueOperation);
-  attrs_len = ntohs (im->attr_len);
-  attrs = GNUNET_RECLAIM_attribute_list_deserialize (buf,
-                                                     attrs_len);
-  for (le = attrs->list_head; NULL != le; le = le->next)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "List entry: %s\n", le->attribute->name);
-
-  tio->r_id = ntohl (im->id);
-  tio->client = idp;
-  GNUNET_CONTAINER_DLL_insert (idp->issue_op_head, idp->issue_op_tail, tio);
-  RECLAIM_TICKETS_issue (&identity,
-                         attrs,
-                         &rp,
-                         &issue_ticket_result_cb,
-                         tio);
-  GNUNET_SERVICE_client_continue (idp->client);
-  GNUNET_RECLAIM_attribute_list_destroy (attrs);
-}
-
-
-/**********************************************************
-* Revocation
-**********************************************************/
-
-/**
- * Handles revocation result
- *
- * @param cls our revocation operation handle
- * @param success revocation result (GNUNET_OK if successful)
- */
-static void
-revoke_result_cb (void *cls, int32_t success)
-{
-  struct TicketRevocationOperation *rop = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct RevokeTicketResultMessage *trm;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending REVOKE_TICKET_RESULT message\n");
-  rop->rh = NULL;
-  env = GNUNET_MQ_msg (trm, GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT);
-  trm->id = htonl (rop->r_id);
-  trm->success = htonl (success);
-  GNUNET_MQ_send (rop->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (rop->client->revoke_op_head,
-                               rop->client->revoke_op_tail,
-                               rop);
-  GNUNET_free (rop);
-}
-
-
-/**
- * Check revocation message format
- *
- * @param cls unused
- * @param im the message to check
- * @return GNUNET_OK if message is ok
- */
-static int
-check_revoke_ticket_message (void *cls, const struct RevokeTicketMessage *im)
-{
-  uint16_t size;
-
-  size = ntohs (im->header.size);
-  if (size != sizeof(struct RevokeTicketMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle a revocation message to a ticket.
- *
- * @param cls our client
- * @param rm the message to handle
- */
-static void
-handle_revoke_ticket_message (void *cls, const struct RevokeTicketMessage *rm)
-{
-  struct TicketRevocationOperation *rop;
-  struct IdpClient *idp = cls;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  struct GNUNET_RECLAIM_Ticket ticket;
-  size_t key_len;
-  size_t tkt_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received REVOKE_TICKET message\n");
-  key_len = ntohs (rm->key_len);
-  buf = (char *) &rm[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  tkt_len = ntohs (rm->tkt_len);
-  if ((GNUNET_SYSERR ==
-       GNUNET_RECLAIM_read_ticket_from_buffer (buf, tkt_len,
-                                               &ticket, &read)) ||
-      (read != tkt_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read ticket\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  rop = GNUNET_new (struct TicketRevocationOperation);
-  rop->r_id = ntohl (rm->id);
-  rop->client = idp;
-  GNUNET_CONTAINER_DLL_insert (idp->revoke_op_head, idp->revoke_op_tail, rop);
-  rop->rh
-    = RECLAIM_TICKETS_revoke (&ticket, &identity, &revoke_result_cb, rop);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/**
- * Handle a ticket consume result
- *
- * @param cls our consume ticket operation handle
- * @param identity the attribute authority
- * @param attrs the attribute/claim list
- * @param success GNUNET_OK if successful
- * @param emsg error message (NULL if success=GNUNET_OK)
- */
-static void
-consume_result_cb (void *cls,
-                   const struct GNUNET_CRYPTO_PublicKey *identity,
-                   const struct GNUNET_RECLAIM_AttributeList *attrs,
-                   const struct GNUNET_RECLAIM_PresentationList *presentations,
-                   int32_t success,
-                   const char *emsg)
-{
-  struct ConsumeTicketOperation *cop = cls;
-  struct ConsumeTicketResultMessage *crm;
-  struct GNUNET_MQ_Envelope *env;
-  char *data_tmp;
-  size_t attrs_len = 0;
-  size_t pres_len = 0;
-  size_t key_len;
-  ssize_t written;
-
-  if (GNUNET_OK != success)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error consuming ticket: %s\n", emsg);
-  }
-  attrs_len = GNUNET_RECLAIM_attribute_list_serialize_get_size (attrs);
-  pres_len = GNUNET_RECLAIM_presentation_list_serialize_get_size (
-    presentations);
-  key_len = GNUNET_CRYPTO_public_key_get_length (identity);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending CONSUME_TICKET_RESULT message\n");
-  env = GNUNET_MQ_msg_extra (crm,
-                             attrs_len + pres_len + key_len,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT);
-  crm->id = htonl (cop->r_id);
-  crm->attrs_len = htons (attrs_len);
-  crm->presentations_len = htons (pres_len);
-  crm->key_len = htons (key_len);
-  crm->result = htons (success);
-  data_tmp = (char *) &crm[1];
-  written = GNUNET_CRYPTO_write_public_key_to_buffer (identity,
-                                                        data_tmp,
-                                                        key_len);
-  GNUNET_assert (0 <= written);
-  data_tmp += written;
-  GNUNET_RECLAIM_attribute_list_serialize (attrs, data_tmp);
-  data_tmp += attrs_len;
-  GNUNET_RECLAIM_presentation_list_serialize (presentations, data_tmp);
-  GNUNET_MQ_send (cop->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (cop->client->consume_op_head,
-                               cop->client->consume_op_tail,
-                               cop);
-  GNUNET_free (cop);
-}
-
-
-/**
- * Check a consume ticket message
- *
- * @param cls unused
- * @param cm the message to handle
- */
-static int
-check_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
-{
-  uint16_t size;
-
-  size = ntohs (cm->header.size);
-  if (size <= sizeof(struct ConsumeTicketMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle a consume ticket message
- *
- * @param cls our client handle
- * @param cm the message to handle
- */
-static void
-handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
-{
-  struct ConsumeTicketOperation *cop;
-  struct IdpClient *idp = cls;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  struct GNUNET_RECLAIM_Ticket ticket;
-  size_t key_len;
-  size_t tkt_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CONSUME_TICKET message\n");
-  key_len = ntohs (cm->key_len);
-  buf = (char *) &cm[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  tkt_len = ntohs (cm->tkt_len);
-  if ((GNUNET_SYSERR ==
-       GNUNET_RECLAIM_read_ticket_from_buffer (buf, tkt_len,
-                                               &ticket, &read)) ||
-      (read != tkt_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read ticket\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  cop = GNUNET_new (struct ConsumeTicketOperation);
-  cop->r_id = ntohl (cm->id);
-  cop->client = idp;
-  cop->ch
-    = RECLAIM_TICKETS_consume (&identity, &ticket, &consume_result_cb,
-                               cop);
-  GNUNET_CONTAINER_DLL_insert (idp->consume_op_head, idp->consume_op_tail, cop);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/*****************************************
-* Attribute store
-*****************************************/
-
-
-/**
- * Attribute store result handler
- *
- * @param cls our attribute store handle
- * @param success GNUNET_OK if successful
- * @param emsg error message (NULL if success=GNUNET_OK)
- */
-static void
-attr_store_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct AttributeStoreHandle *ash = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct SuccessResultMessage *acr_msg;
-
-  ash->ns_qe = NULL;
-  GNUNET_CONTAINER_DLL_remove (ash->client->store_op_head,
-                               ash->client->store_op_tail,
-                               ash);
-
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store attribute %s\n",
-                GNUNET_ErrorCode_get_hint (ec));
-    cleanup_as_handle (ash);
-    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-    return;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending SUCCESS_RESPONSE message\n");
-  env = GNUNET_MQ_msg (acr_msg, GNUNET_MESSAGE_TYPE_RECLAIM_SUCCESS_RESPONSE);
-  acr_msg->id = htonl (ash->r_id);
-  acr_msg->op_result = htonl (GNUNET_OK);
-  GNUNET_MQ_send (ash->client->mq, env);
-  cleanup_as_handle (ash);
-}
-
-
-/**
- * Add a new attribute
- *
- * @param cls the AttributeStoreHandle
- */
-static void
-attr_store_task (void *cls)
-{
-  struct AttributeStoreHandle *ash = cls;
-  struct GNUNET_GNSRECORD_Data rd[1];
-  char *buf;
-  char *label;
-  size_t buf_size;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Storing attribute\n");
-  buf_size = GNUNET_RECLAIM_attribute_serialize_get_size (ash->claim);
-  buf = GNUNET_malloc (buf_size);
-  // Give the ash a new id if unset
-  if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&ash->claim->id))
-    GNUNET_RECLAIM_id_generate (&ash->claim->id);
-  GNUNET_RECLAIM_attribute_serialize (ash->claim, buf);
-  label
-    = GNUNET_STRINGS_data_to_string_alloc (&ash->claim->id,
-                                           sizeof (ash->claim->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypting with label %s\n", label);
-
-  rd[0].data_size = buf_size;
-  rd[0].data = buf;
-  rd[0].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE;
-  rd[0].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-  rd[0].expiration_time = ash->exp.rel_value_us;
-  ash->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &ash->identity,
-                                               label,
-                                               1,
-                                               rd,
-                                               &attr_store_cont,
-                                               ash);
-  GNUNET_free (buf);
-  GNUNET_free (label);
-}
-
-
-/**
- * Check an attribute store message
- *
- * @param cls unused
- * @param sam the message to check
- */
-static int
-check_attribute_store_message (void *cls,
-                               const struct AttributeStoreMessage *sam)
-{
-  uint16_t size;
-
-  size = ntohs (sam->header.size);
-  if (size <= sizeof(struct AttributeStoreMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle an attribute store message
- *
- * @param cls our client
- * @param sam the message to handle
- */
-static void
-handle_attribute_store_message (void *cls,
-                                const struct AttributeStoreMessage *sam)
-{
-  struct AttributeStoreHandle *ash;
-  struct IdpClient *idp = cls;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  size_t data_len;
-  size_t key_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received ATTRIBUTE_STORE message\n");
-
-  data_len = ntohs (sam->attr_len);
-  key_len = ntohs (sam->key_len);
-  buf = (char *) &sam[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  ash = GNUNET_new (struct AttributeStoreHandle);
-  GNUNET_RECLAIM_attribute_deserialize (buf,
-                                        data_len,
-                                        &ash->claim);
-
-  ash->r_id = ntohl (sam->id);
-  ash->identity = identity;
-  ash->exp.rel_value_us = GNUNET_ntohll (sam->exp);
-  GNUNET_CRYPTO_key_get_public (&identity, &ash->identity_pkey);
-
-  GNUNET_SERVICE_client_continue (idp->client);
-  ash->client = idp;
-  GNUNET_CONTAINER_DLL_insert (idp->store_op_head, idp->store_op_tail, ash);
-  GNUNET_SCHEDULER_add_now (&attr_store_task, ash);
-}
-
-
-/**
- * Credential store result handler
- *
- * @param cls our attribute store handle
- * @param success GNUNET_OK if successful
- * @param emsg error message (NULL if success=GNUNET_OK)
- */
-static void
-cred_store_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct AttributeStoreHandle *ash = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct SuccessResultMessage *acr_msg;
-
-  ash->ns_qe = NULL;
-  GNUNET_CONTAINER_DLL_remove (ash->client->store_op_head,
-                               ash->client->store_op_tail,
-                               ash);
-
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store credential: %s\n",
-                GNUNET_ErrorCode_get_hint (ec));
-    cleanup_as_handle (ash);
-    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-    return;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending SUCCESS_RESPONSE message\n");
-  env = GNUNET_MQ_msg (acr_msg, GNUNET_MESSAGE_TYPE_RECLAIM_SUCCESS_RESPONSE);
-  acr_msg->id = htonl (ash->r_id);
-  acr_msg->op_result = htonl (GNUNET_OK);
-  GNUNET_MQ_send (ash->client->mq, env);
-  cleanup_as_handle (ash);
-}
-
-
-/**
- * Error looking up potential credential. Abort.
- *
- * @param cls our attribute store handle
- */
-static void
-cred_error (void *cls)
-{
-  struct AttributeStoreHandle *ash = cls;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Failed to check for existing credential.\n");
-  cleanup_as_handle (ash);
-  GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-  return;
-}
-
-
-/**
-* Check for existing record before storing credential
-*
-* @param cls our attribute store handle
-* @param zone zone we are iterating
-* @param label label of the records
-* @param rd_count record count
-* @param rd records
-*/
-static void
-cred_add_cb (void *cls,
-             const struct GNUNET_CRYPTO_PrivateKey *zone,
-             const char *label,
-             unsigned int rd_count,
-             const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct AttributeStoreHandle *ash = cls;
-  struct GNUNET_GNSRECORD_Data rd_new[1];
-  char *buf;
-  size_t buf_size;
-
-  buf_size = GNUNET_RECLAIM_credential_serialize_get_size (ash->credential);
-  buf = GNUNET_malloc (buf_size);
-  GNUNET_RECLAIM_credential_serialize (ash->credential, buf);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Storing new credential under `%s'.\n",
-              label);
-  rd_new[0].data_size = buf_size;
-  rd_new[0].data = buf;
-  rd_new[0].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL;
-  rd_new[0].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-  rd_new[0].expiration_time = ash->exp.rel_value_us;
-  ash->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &ash->identity,
-                                               label,
-                                               1,
-                                               rd_new,
-                                               &cred_store_cont,
-                                               ash);
-  GNUNET_free (buf);
-  return;
-}
-
-
-/**
- * Add a new credential
- *
- * @param cls the AttributeStoreHandle
- */
-static void
-cred_store_task (void *cls)
-{
-  struct AttributeStoreHandle *ash = cls;
-  char *label;
-
-  // Give the ash a new id if unset
-  if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&ash->credential->id))
-    GNUNET_RECLAIM_id_generate (&ash->credential->id);
-  label = GNUNET_STRINGS_data_to_string_alloc (&ash->credential->id,
-                                               sizeof (ash->credential->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Looking up existing data under label `%s'\n", label);
-  ash->ns_qe = GNUNET_NAMESTORE_records_lookup (nsh,
-                                                &ash->identity,
-                                                label,
-                                                &cred_error,
-                                                ash,
-                                                &cred_add_cb,
-                                                ash);
-  GNUNET_free (label);
-}
-
-
-/**
- * Check an credential store message
- *
- * @param cls unused
- * @param sam the message to check
- */
-static int
-check_credential_store_message (void *cls,
-                                const struct AttributeStoreMessage *sam)
-{
-  uint16_t size;
-
-  size = ntohs (sam->header.size);
-  if (size <= sizeof(struct AttributeStoreMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
-* Handle a credential store message
-*
-* @param cls our client
-* @param sam the message to handle
-*/
-static void
-handle_credential_store_message (void *cls,
-                                 const struct AttributeStoreMessage *sam)
-{
-  struct AttributeStoreHandle *ash;
-  struct IdpClient *idp = cls;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  size_t data_len;
-  size_t key_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CREDENTIAL_STORE message\n");
-
-  data_len = ntohs (sam->attr_len);
-  key_len = ntohs (sam->key_len);
-  buf = (char *) &sam[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  ash = GNUNET_new (struct AttributeStoreHandle);
-  ash->credential = GNUNET_RECLAIM_credential_deserialize (buf,
-                                                           data_len);
-
-  ash->r_id = ntohl (sam->id);
-  ash->identity = identity;
-  ash->exp.rel_value_us = GNUNET_ntohll (sam->exp);
-  GNUNET_CRYPTO_key_get_public (&identity, &ash->identity_pkey);
-
-  GNUNET_SERVICE_client_continue (idp->client);
-  ash->client = idp;
-  GNUNET_CONTAINER_DLL_insert (idp->store_op_head, idp->store_op_tail, ash);
-  GNUNET_SCHEDULER_add_now (&cred_store_task, ash);
-}
-
-
-/**
- * Send a deletion success response
- *
- * @param adh our attribute deletion handle
- * @param success the success status
- */
-static void
-send_delete_response (struct AttributeDeleteHandle *adh, int32_t success)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct SuccessResultMessage *acr_msg;
-
-  GNUNET_CONTAINER_DLL_remove (adh->client->delete_op_head,
-                               adh->client->delete_op_tail,
-                               adh);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending SUCCESS_RESPONSE message\n");
-  env = GNUNET_MQ_msg (acr_msg, GNUNET_MESSAGE_TYPE_RECLAIM_SUCCESS_RESPONSE);
-  acr_msg->id = htonl (adh->r_id);
-  acr_msg->op_result = htonl (success);
-  GNUNET_MQ_send (adh->client->mq, env);
-}
-
-
-/**
- * Namestore iteration within attribute deletion.
- * We need to reissue tickets with the deleted attribute removed.
- *
- * @param cls our attribute deletion handle
- * @param zone the private key of the ticket issuer
- * @param label the label of the record
- * @param rd_count number of records
- * @param rd record data
- */
-static void
-consistency_iter (void *cls,
-                  const struct GNUNET_CRYPTO_PrivateKey *zone,
-                  const char *label,
-                  unsigned int rd_count,
-                  const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct AttributeDeleteHandle *adh = cls;
-  struct TicketRecordsEntry *le;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_RECLAIM_CredentialListEntry *cle;
-  int is_ticket = GNUNET_NO;
-  for (int i = 0; i < rd_count; i++)
-  {
-    switch (rd[i].record_type)
-    {
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE:
-      ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-      GNUNET_RECLAIM_attribute_deserialize (rd[i].data,
-                                            rd[i].data_size,
-                                            &ale->attribute);
-      GNUNET_CONTAINER_DLL_insert (adh->existing_attributes->list_head,
-                                   adh->existing_attributes->list_tail,
-                                   ale);
-      break;
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL:
-      cle = GNUNET_new (struct GNUNET_RECLAIM_CredentialListEntry);
-      cle->credential = GNUNET_RECLAIM_credential_deserialize (rd[i].data,
-                                                               rd[i].data_size);
-      GNUNET_CONTAINER_DLL_insert (adh->existing_credentials->list_head,
-                                   adh->existing_credentials->list_tail,
-                                   cle);
-      break;
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Ticket to delete found (%s)\n",
-                  label);
-      is_ticket = GNUNET_YES;
-      break;
-    default:
-      break;
-    }
-    if (GNUNET_YES == is_ticket)
-      break;
-  }
-  if (GNUNET_YES == is_ticket)
-  {
-    le = GNUNET_new (struct TicketRecordsEntry);
-    le->data_size = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
-    le->data = GNUNET_malloc (le->data_size);
-    le->rd_count = rd_count;
-    le->label = GNUNET_strdup (label);
-    GNUNET_GNSRECORD_records_serialize (rd_count, rd, le->data_size, le->data);
-    GNUNET_CONTAINER_DLL_insert (adh->tickets_to_update_head,
-                                 adh->tickets_to_update_tail,
-                                 le);
-  }
-  GNUNET_NAMESTORE_zone_iterator_next (adh->ns_it, 1);
-}
-
-
-/**
- * Recursion prototype for function
- * @param cls our deletion handle
- */
-static void
-update_tickets (void *cls);
-
-
-/**
- * Callback called when a ticket was updated
- *
- * @param cls our attribute deletion handle
- * @param success GNUNET_OK if successful
- * @param emsg error message (NULL if success=GNUNET_OK)
- */
-static void
-ticket_updated (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct AttributeDeleteHandle *adh = cls;
-
-  adh->ns_qe = NULL;
-  GNUNET_SCHEDULER_add_now (&update_tickets, adh);
-}
-
-
-/**
- * Update tickets: Remove shared attribute which has just been deleted.
- * This method is called recursively until all tickets are processed.
- * Eventually, the updated tickets are stored using ``update_tickets''.
- *
- * @param cls our attribute deletion handle
- */
-static void
-update_tickets (void *cls)
-{
-  struct AttributeDeleteHandle *adh = cls;
-  struct TicketRecordsEntry *le;
-
-  if (NULL == adh->tickets_to_update_head)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Finished updating tickets, success\n");
-    send_delete_response (adh, GNUNET_OK);
-    cleanup_adh (adh);
-    return;
-  }
-  le = adh->tickets_to_update_head;
-  GNUNET_CONTAINER_DLL_remove (adh->tickets_to_update_head,
-                               adh->tickets_to_update_tail,
-                               le);
-  struct GNUNET_GNSRECORD_Data rd[le->rd_count];
-  struct GNUNET_GNSRECORD_Data rd_new[le->rd_count - 1];
-  if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (le->data_size,
-                                                         le->data,
-                                                         le->rd_count,
-                                                         rd))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to deserialize record data!\n");
-    send_delete_response (adh, GNUNET_SYSERR);
-    cleanup_adh (adh);
-    return;
-  }
-  int j = 0;
-  int i = 0;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_RECLAIM_CredentialListEntry *cle;
-  struct GNUNET_RECLAIM_Presentation *presentation;
-  for (i = 0; i < le->rd_count; i++)
-  {
-    switch (rd[i].record_type)
-    {
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF:
-      for (ale = adh->existing_attributes->list_head; NULL != ale; ale =
-             ale->next)
-      {
-        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (rd[i].data,
-                                                      &ale->attribute->id))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Found attribute %s, readding...\n",
-                      ale->attribute->name);
-          rd_new[j] = rd[i];
-          j++;
-          break;   // Found and added
-        }
-      }
-      break;
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION:
-      presentation = GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
-                                                              rd[i].data_size);
-      for (cle = adh->existing_credentials->list_head; NULL != cle; cle =
-             cle->next)
-      {
-        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (
-              &presentation->credential_id,
-              &cle->credential->id))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Found presentation for credential %s, readding...\n",
-                      cle->credential->name);
-          rd_new[j] = rd[i];
-          j++;
-          break;   // Found and added
-        }
-      }
-      GNUNET_free (presentation);
-      break;
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET:
-      rd_new[j] = rd[i];
-      j++;
-      break;   // Found and added
-    default:
-      GNUNET_break (0);
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Updating ticket with %d entries (%d before)...\n",
-              j, i);
-  adh->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &adh->identity,
-                                               le->label,
-                                               j,
-                                               rd_new,
-                                               &ticket_updated,
-                                               adh);
-  GNUNET_free (le->label);
-  GNUNET_free (le->data);
-  GNUNET_free (le);
-}
-
-
-/**
- * Delete all attributes which reference credentials
- * that no longer exist
- */
-static void
-purge_attributes (void *cls);;
-
-static void
-offending_attr_delete_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct AttributeDeleteHandle *adh = cls;
-
-  adh->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error deleting attribute %s\n",
-                adh->label);
-    send_delete_response (adh, GNUNET_SYSERR);
-    cleanup_adh (adh);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Continuing consistency check...\n");
-  GNUNET_SCHEDULER_add_now (&purge_attributes, adh);
-}
-
-
-/**
- * Delete all attributes which reference credentials
- * that no longer exist
- */
-static void
-purge_attributes (void *cls)
-{
-  struct AttributeDeleteHandle *adh = cls;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_RECLAIM_CredentialListEntry *cle;
-
-  for (ale = adh->existing_attributes->list_head; NULL != ale; ale = ale->next)
-  {
-    if (GNUNET_YES ==
-        GNUNET_RECLAIM_id_is_zero (&ale->attribute->credential))
-      continue;
-
-    for (cle = adh->existing_credentials->list_head;
-         NULL != cle; cle = cle->next)
-    {
-      if (GNUNET_YES !=
-          GNUNET_RECLAIM_id_is_equal (&cle->credential->id,
-                                      &ale->attribute->credential))
-        continue;
-      break;
-    }
-    if (NULL == cle)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Found attribute with missing credential\n");
-      break;
-    }
-  }
-  if (NULL == ale)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Attributes consistent, updating tickets.\n");
-    GNUNET_SCHEDULER_add_now (&update_tickets, adh);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Attributes inconsistent, deleting offending attribute.\n");
-  char *label
-    = GNUNET_STRINGS_data_to_string_alloc (&ale->attribute->id,
-                                           sizeof(ale->attribute->id));
-
-  adh->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &adh->identity,
-                                               label,
-                                               0,
-                                               NULL,
-                                               &offending_attr_delete_cont,
-                                               adh);
-  GNUNET_CONTAINER_DLL_remove (adh->existing_attributes->list_head,
-                               adh->existing_attributes->list_tail,
-                               ale);
-  GNUNET_free (ale);
-  GNUNET_free (label);
-}
-
-
-/**
- * Done collecting affected tickets, start updating.
- *
- * @param cls our attribute deletion handle
- */
-static void
-consistency_iter_fin (void *cls)
-{
-  struct AttributeDeleteHandle *adh = cls;
-  adh->ns_it = NULL;
-  GNUNET_SCHEDULER_add_now (&purge_attributes, adh);
-}
-
-
-/**
- * Error collecting affected tickets. Abort.
- *
- * @param cls our attribute deletion handle
- */
-static void
-consistency_iter_err (void *cls)
-{
-  struct AttributeDeleteHandle *adh = cls;
-
-  adh->ns_it = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Namestore error on consistency check\n");
-  send_delete_response (adh, GNUNET_SYSERR);
-  cleanup_adh (adh);
-}
-
-
-/**
- * Start processing tickets which may still contain reference to deleted
- * attribute.
- *
- * @param cls attribute deletion handle
- */
-static void
-start_consistency_update (void *cls)
-{
-  struct AttributeDeleteHandle *adh = cls;
-
-  adh->existing_attributes = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  adh->existing_credentials = GNUNET_new (struct GNUNET_RECLAIM_CredentialList);
-
-  adh->ns_it = GNUNET_NAMESTORE_zone_iteration_start (nsh,
-                                                      &adh->identity,
-                                                      &consistency_iter_err,
-                                                      adh,
-                                                      &consistency_iter,
-                                                      adh,
-                                                      &consistency_iter_fin,
-                                                      adh);
-}
-
-
-/**
- * Attribute deleted callback
- *
- * @param cls our handle
- * @param success success status
- * @param emsg error message (NULL if success=GNUNET_OK)
- */
-static void
-attr_delete_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct AttributeDeleteHandle *adh = cls;
-
-  adh->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error deleting attribute %s\n",
-                adh->label);
-    send_delete_response (adh, GNUNET_SYSERR);
-    cleanup_adh (adh);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating tickets...\n");
-  GNUNET_SCHEDULER_add_now (&start_consistency_update, adh);
-}
-
-
-/**
- * Check attribute delete message format
- *
- * @param cls unused
- * @param dam message to check
- */
-static int
-check_attribute_delete_message (void *cls,
-                                const struct AttributeDeleteMessage *dam)
-{
-  uint16_t size;
-
-  size = ntohs (dam->header.size);
-  if (size <= sizeof(struct AttributeDeleteMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle attribute deletion
- *
- * @param cls our client
- * @param dam deletion message
- */
-static void
-handle_attribute_delete_message (void *cls,
-                                 const struct AttributeDeleteMessage *dam)
-{
-  struct AttributeDeleteHandle *adh;
-  struct IdpClient *idp = cls;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  size_t data_len;
-  size_t key_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received ATTRIBUTE_DELETE message\n");
-
-  data_len = ntohs (dam->attr_len);
-  key_len = ntohs (dam->key_len);
-  buf = (char *) &dam[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  adh = GNUNET_new (struct AttributeDeleteHandle);
-  GNUNET_RECLAIM_attribute_deserialize (buf,
-                                        data_len,
-                                        &adh->claim);
-  adh->credential = NULL;
-
-  adh->r_id = ntohl (dam->id);
-  adh->identity = identity;
-  adh->label
-    = GNUNET_STRINGS_data_to_string_alloc (&adh->claim->id,
-                                           sizeof(adh->claim->id));
-  GNUNET_SERVICE_client_continue (idp->client);
-  adh->client = idp;
-  GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh);
-  adh->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &adh->identity,
-                                               adh->label,
-                                               0,
-                                               NULL,
-                                               &attr_delete_cont,
-                                               adh);
-}
-
-
-/**
- * Credential deleted callback
- *
- * @param cls our handle
- * @param success success status
- * @param emsg error message (NULL if success=GNUNET_OK)
- */
-static void
-cred_delete_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct AttributeDeleteHandle *adh = cls;
-
-  adh->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error deleting credential `%s'\n",
-                adh->label);
-    send_delete_response (adh, GNUNET_SYSERR);
-    cleanup_adh (adh);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating tickets...\n");
-  GNUNET_SCHEDULER_add_now (&start_consistency_update, adh);
-}
-
-
-/**
- * Check credential delete message format
- *
- * @param cls unused
- * @param dam message to check
- */
-static int
-check_credential_delete_message (void *cls,
-                                 const struct AttributeDeleteMessage *dam)
-{
-  uint16_t size;
-
-  size = ntohs (dam->header.size);
-  if (size <= sizeof(struct AttributeDeleteMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle credential deletion
- *
- * @param cls our client
- * @param dam deletion message
- */
-static void
-handle_credential_delete_message (void *cls,
-                                  const struct AttributeDeleteMessage *dam)
-{
-  struct AttributeDeleteHandle *adh;
-  struct IdpClient *idp = cls;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  size_t data_len;
-  size_t key_len;
-  size_t read;
-  char *buf;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CREDENTIAL_DELETE message\n");
-
-  data_len = ntohs (dam->attr_len);
-  key_len = ntohs (dam->key_len);
-  buf = (char *) &dam[1];
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (buf, key_len,
-                                                     &identity, &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  buf += read;
-  adh = GNUNET_new (struct AttributeDeleteHandle);
-  adh->credential = GNUNET_RECLAIM_credential_deserialize (buf,
-                                                           data_len);
-  adh->claim = NULL;
-
-  adh->r_id = ntohl (dam->id);
-  adh->identity = identity;
-  adh->label
-    = GNUNET_STRINGS_data_to_string_alloc (&adh->credential->id,
-                                           sizeof(adh->credential->id));
-  GNUNET_SERVICE_client_continue (idp->client);
-  adh->client = idp;
-  GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh);
-  adh->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &adh->identity,
-                                               adh->label,
-                                               0,
-                                               NULL,
-                                               &cred_delete_cont,
-                                               adh);
-}
-
-
-/*************************************************
- * Attribute iteration
- *************************************************/
-
-
-/**
- * Done iterating over attributes
- *
- * @param cls our iterator handle
- */
-static void
-attr_iter_finished (void *cls)
-{
-  struct Iterator *ai = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct AttributeResultMessage *arm;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending ATTRIBUTE_RESULT message\n");
-  env = GNUNET_MQ_msg (arm, GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT);
-  arm->id = htonl (ai->request_id);
-  arm->attr_len = htons (0);
-  arm->pkey_len = htons (0);
-  GNUNET_MQ_send (ai->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (ai->client->attr_iter_head,
-                               ai->client->attr_iter_tail,
-                               ai);
-  GNUNET_free (ai);
-}
-
-
-/**
- * Error iterating over attributes. Abort.
- *
- * @param cls our attribute iteration handle
- */
-static void
-attr_iter_error (void *cls)
-{
-  struct Iterator *ai = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to iterate over attributes\n");
-  attr_iter_finished (ai);
-}
-
-
-/**
- * Got record. Return if it is an attribute.
- *
- * @param cls our attribute iterator
- * @param zone zone we are iterating
- * @param label label of the records
- * @param rd_count record count
- * @param rd records
- */
-static void
-attr_iter_cb (void *cls,
-              const struct GNUNET_CRYPTO_PrivateKey *zone,
-              const char *label,
-              unsigned int rd_count,
-              const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct Iterator *ai = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_CRYPTO_PublicKey identity;
-  char *data_tmp;
-  size_t key_len;
-  ssize_t written;
-
-  if ((rd_count != 1) ||
-      (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE != rd->record_type))
-  {
-    GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, 1);
-    return;
-  }
-  struct AttributeResultMessage *arm;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attribute under: %s\n",
-              label);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending ATTRIBUTE_RESULT message\n");
-  GNUNET_CRYPTO_key_get_public (zone, &identity);
-  key_len = GNUNET_CRYPTO_public_key_get_length (&identity);
-  env = GNUNET_MQ_msg_extra (arm,
-                             rd->data_size + key_len,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT);
-  arm->id = htonl (ai->request_id);
-  arm->attr_len = htons (rd->data_size);
-  data_tmp = (char *) &arm[1];
-  arm->pkey_len = htons (key_len);
-  written = GNUNET_CRYPTO_write_public_key_to_buffer (&identity,
-                                                        data_tmp,
-                                                        key_len);
-  GNUNET_assert (0 <= written);
-  data_tmp += written;
-  GNUNET_memcpy (data_tmp, rd->data, rd->data_size);
-  GNUNET_MQ_send (ai->client->mq, env);
-}
-
-
-static enum GNUNET_GenericReturnValue
-check_iteration_start (
-  void *cls,
-  const struct AttributeIterationStartMessage *ais_msg)
-{
-  uint16_t size;
-  size_t key_len;
-
-  size = ntohs (ais_msg->header.size);
-  key_len = ntohs (ais_msg->key_len);
-
-  if (size < key_len + sizeof(*ais_msg))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-/**
- * Iterate over zone to get attributes
- *
- * @param cls our client
- * @param ais_msg the iteration message to start
- */
-static void
-handle_iteration_start (void *cls,
-                        const struct AttributeIterationStartMessage *ais_msg)
-{
-  struct IdpClient *idp = cls;
-  struct Iterator *ai;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  size_t key_len;
-  size_t read;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received ATTRIBUTE_ITERATION_START message\n");
-  key_len = ntohs (ais_msg->key_len);
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (&ais_msg[1],
-                                                     key_len,
-                                                     &identity,
-                                                     &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key.\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  ai = GNUNET_new (struct Iterator);
-  ai->request_id = ntohl (ais_msg->id);
-  ai->client = idp;
-  ai->identity = identity;
-
-  GNUNET_CONTAINER_DLL_insert (idp->attr_iter_head, idp->attr_iter_tail, ai);
-  ai->ns_it = GNUNET_NAMESTORE_zone_iteration_start (nsh,
-                                                     &ai->identity,
-                                                     &attr_iter_error,
-                                                     ai,
-                                                     &attr_iter_cb,
-                                                     ai,
-                                                     &attr_iter_finished,
-                                                     ai);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/**
- * Handle iteration stop message from client
- *
- * @param cls the client
- * @param ais_msg the stop message
- */
-static void
-handle_iteration_stop (void *cls,
-                       const struct AttributeIterationStopMessage *ais_msg)
-{
-  struct IdpClient *idp = cls;
-  struct Iterator *ai;
-  uint32_t rid;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "ATTRIBUTE_ITERATION_STOP");
-  rid = ntohl (ais_msg->id);
-  for (ai = idp->attr_iter_head; NULL != ai; ai = ai->next)
-    if (ai->request_id == rid)
-      break;
-  if (NULL == ai)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (idp->attr_iter_head, idp->attr_iter_tail, ai);
-  GNUNET_free (ai);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/**
- * Client requests next attribute from iterator
- *
- * @param cls the client
- * @param ais_msg the message
- */
-static void
-handle_iteration_next (void *cls,
-                       const struct AttributeIterationNextMessage *ais_msg)
-{
-  struct IdpClient *idp = cls;
-  struct Iterator *ai;
-  uint32_t rid;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received ATTRIBUTE_ITERATION_NEXT message\n");
-  rid = ntohl (ais_msg->id);
-  for (ai = idp->attr_iter_head; NULL != ai; ai = ai->next)
-    if (ai->request_id == rid)
-      break;
-  if (NULL == ai)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, 1);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/*************************************************
- * Credential iteration
- *************************************************/
-
-
-/**
- * Done iterating over credentials
- *
- * @param cls our iterator handle
- */
-static void
-cred_iter_finished (void *cls)
-{
-  struct Iterator *ai = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct CredentialResultMessage *arm;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending CREDENTIAL_RESULT message\n");
-  env = GNUNET_MQ_msg (arm, GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_RESULT);
-  arm->id = htonl (ai->request_id);
-  arm->credential_len = htons (0);
-  arm->key_len = htons (0);
-  GNUNET_MQ_send (ai->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (ai->client->cred_iter_head,
-                               ai->client->cred_iter_tail,
-                               ai);
-  GNUNET_free (ai);
-}
-
-
-/**
- * Error iterating over credentials. Abort.
- *
- * @param cls our attribute iteration handle
- */
-static void
-cred_iter_error (void *cls)
-{
-  struct Iterator *ai = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to iterate over credentials\n");
-  cred_iter_finished (ai);
-}
-
-
-/**
- * Got record. Return credential.
- *
- * @param cls our attribute iterator
- * @param zone zone we are iterating
- * @param label label of the records
- * @param rd_count record count
- * @param rd records
- */
-static void
-cred_iter_cb (void *cls,
-              const struct GNUNET_CRYPTO_PrivateKey *zone,
-              const char *label,
-              unsigned int rd_count,
-              const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct Iterator *ai = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct CredentialResultMessage *arm;
-  struct GNUNET_CRYPTO_PublicKey identity;
-  char *data_tmp;
-  size_t key_len;
-  ssize_t written;
-
-  if ((rd_count != 1) ||
-      (GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL != rd->record_type))
-  {
-    GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, 1);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found credential under: %s\n",
-              label);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending CREDENTIAL_RESULT message\n");
-  GNUNET_CRYPTO_key_get_public (zone, &identity);
-  key_len = GNUNET_CRYPTO_public_key_get_length (&identity);
-  env = GNUNET_MQ_msg_extra (arm,
-                             rd->data_size + key_len,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_RESULT);
-  arm->id = htonl (ai->request_id);
-  arm->credential_len = htons (rd->data_size);
-  arm->key_len = htons (key_len);
-  data_tmp = (char *) &arm[1];
-  written = GNUNET_CRYPTO_write_public_key_to_buffer (&identity,
-                                                        data_tmp,
-                                                        key_len);
-  GNUNET_assert (written >= 0);
-  data_tmp += written;
-  GNUNET_memcpy (data_tmp, rd->data, rd->data_size);
-  GNUNET_MQ_send (ai->client->mq, env);
-}
-
-static enum GNUNET_GenericReturnValue
-check_credential_iteration_start (
-  void *cls,
-  const struct CredentialIterationStartMessage *cis_msg)
-{
-  uint16_t size;
-  size_t key_len;
-
-  size = ntohs (cis_msg->header.size);
-  key_len = ntohs (cis_msg->key_len);
-
-  if (size < key_len + sizeof(*cis_msg))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterate over zone to get attributes
- *
- * @param cls our client
- * @param ais_msg the iteration message to start
- */
-static void
-handle_credential_iteration_start (void *cls,
-                                   const struct
-                                   CredentialIterationStartMessage *ais_msg)
-{
-  struct IdpClient *idp = cls;
-  struct Iterator *ai;
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  size_t key_len;
-  size_t read;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received CREDENTIAL_ITERATION_START message\n");
-  key_len = ntohs (ais_msg->key_len);
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (&ais_msg[1],
-                                                     key_len,
-                                                     &identity,
-                                                     &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key.\n");
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  ai = GNUNET_new (struct Iterator);
-  ai->request_id = ntohl (ais_msg->id);
-  ai->client = idp;
-  ai->identity = identity;
-
-  GNUNET_CONTAINER_DLL_insert (idp->cred_iter_head, idp->cred_iter_tail,
-                               ai);
-  ai->ns_it = GNUNET_NAMESTORE_zone_iteration_start (nsh,
-                                                     &ai->identity,
-                                                     &cred_iter_error,
-                                                     ai,
-                                                     &cred_iter_cb,
-                                                     ai,
-                                                     &cred_iter_finished,
-                                                     ai);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/**
- * Handle iteration stop message from client
- *
- * @param cls the client
- * @param ais_msg the stop message
- */
-static void
-handle_credential_iteration_stop (void *cls,
-                                  const struct
-                                  CredentialIterationStopMessage *ais_msg)
-{
-  struct IdpClient *idp = cls;
-  struct Iterator *ai;
-  uint32_t rid;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "CREDENTIAL_ITERATION_STOP");
-  rid = ntohl (ais_msg->id);
-  for (ai = idp->cred_iter_head; NULL != ai; ai = ai->next)
-    if (ai->request_id == rid)
-      break;
-  if (NULL == ai)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (idp->cred_iter_head, idp->cred_iter_tail,
-                               ai);
-  GNUNET_free (ai);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/**
- * Client requests next credential from iterator
- *
- * @param cls the client
- * @param ais_msg the message
- */
-static void
-handle_credential_iteration_next (void *cls,
-                                  const struct
-                                  CredentialIterationNextMessage *ais_msg)
-{
-  struct IdpClient *idp = cls;
-  struct Iterator *ai;
-  uint32_t rid;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received CREDENTIAL_ITERATION_NEXT message\n");
-  rid = ntohl (ais_msg->id);
-  for (ai = idp->cred_iter_head; NULL != ai; ai = ai->next)
-    if (ai->request_id == rid)
-      break;
-  if (NULL == ai)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (idp->client);
-    return;
-  }
-  GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, 1);
-  GNUNET_SERVICE_client_continue (idp->client);
-}
-
-
-/******************************************************
- * Ticket iteration
- ******************************************************/
-
-/**
- * Got a ticket. Return to client
- *
- * @param cls our ticket iterator
- * @param ticket the ticket
- */
-static void
-ticket_iter_cb (void *cls, struct GNUNET_RECLAIM_Ticket *ticket)
-{
-  struct TicketIteration *ti = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct TicketResultMessage *trm;
-  size_t tkt_len;
-
-  if (NULL == ticket)
-    tkt_len = 0;
-  else
-    tkt_len = GNUNET_RECLAIM_ticket_serialize_get_size (ticket);
-
-  env = GNUNET_MQ_msg_extra (trm,
-                             tkt_len,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT);
-  if (NULL == ticket)
-  {
-    /* send empty response to indicate end of list */
-    GNUNET_CONTAINER_DLL_remove (ti->client->ticket_iter_head,
-                                 ti->client->ticket_iter_tail,
-                                 ti);
-  }
-  else
-  {
-    GNUNET_RECLAIM_write_ticket_to_buffer (ticket,
-                                           &trm[1],
-                                           tkt_len);
-  }
-  trm->tkt_len = htons (tkt_len);
-  trm->id = htonl (ti->r_id);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending TICKET_RESULT message\n");
-  GNUNET_MQ_send (ti->client->mq, env);
-  if (NULL == ticket)
-    GNUNET_free (ti);
-}
-
-static enum GNUNET_GenericReturnValue
-check_ticket_iteration_start (
-  void *cls,
-  const struct TicketIterationStartMessage *tis_msg)
-{
-  uint16_t size;
-  size_t key_len;
-
-  size = ntohs (tis_msg->header.size);
-  key_len = ntohs (tis_msg->key_len);
-
-  if (size < key_len + sizeof(*tis_msg))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-/**
- * Client requests a ticket iteration
- *
- * @param cls the client
- * @param tis_msg the iteration request message
- */
-static void
-handle_ticket_iteration_start (
-  void *cls,
-  const struct TicketIterationStartMessage *tis_msg)
-{
-  struct GNUNET_CRYPTO_PrivateKey identity;
-  struct IdpClient *client = cls;
-  struct TicketIteration *ti;
-  size_t key_len;
-  size_t read;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received TICKET_ITERATION_START message\n");
-  key_len = ntohs (tis_msg->key_len);
-  if ((GNUNET_SYSERR ==
-       GNUNET_CRYPTO_read_private_key_from_buffer (&tis_msg[1],
-                                                     key_len,
-                                                     &identity,
-                                                     &read)) ||
-      (read != key_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read private key\n");
-    GNUNET_SERVICE_client_drop (client->client);
-    return;
-  }
-  ti = GNUNET_new (struct TicketIteration);
-  ti->r_id = ntohl (tis_msg->id);
-  ti->client = client;
-  GNUNET_CONTAINER_DLL_insert (client->ticket_iter_head,
-                               client->ticket_iter_tail,
-                               ti);
-  ti->iter
-    = RECLAIM_TICKETS_iteration_start (&identity, &ticket_iter_cb, ti);
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * Client has had enough tickets
- *
- * @param cls the client
- * @param tis_msg the stop message
- */
-static void
-handle_ticket_iteration_stop (void *cls,
-                              const struct TicketIterationStopMessage *tis_msg)
-{
-  struct IdpClient *client = cls;
-  struct TicketIteration *ti;
-  uint32_t rid;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "TICKET_ITERATION_STOP");
-  rid = ntohl (tis_msg->id);
-  for (ti = client->ticket_iter_head; NULL != ti; ti = ti->next)
-    if (ti->r_id == rid)
-      break;
-  if (NULL == ti)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (client->client);
-    return;
-  }
-  RECLAIM_TICKETS_iteration_stop (ti->iter);
-  GNUNET_CONTAINER_DLL_remove (client->ticket_iter_head,
-                               client->ticket_iter_tail,
-                               ti);
-  GNUNET_free (ti);
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * Client requests next result.
- *
- * @param cls the client
- * @param tis_msg the message
- */
-static void
-handle_ticket_iteration_next (void *cls,
-                              const struct TicketIterationNextMessage *tis_msg)
-{
-  struct IdpClient *client = cls;
-  struct TicketIteration *ti;
-  uint32_t rid;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received TICKET_ITERATION_NEXT message\n");
-  rid = ntohl (tis_msg->id);
-  for (ti = client->ticket_iter_head; NULL != ti; ti = ti->next)
-    if (ti->r_id == rid)
-      break;
-  if (NULL == ti)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (client->client);
-    return;
-  }
-  RECLAIM_TICKETS_iteration_next (ti->iter);
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * Main function that will be run
- *
- * @param cls closure
- * @param c the configuration used
- * @param server the service handle
- */
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c,
-     struct GNUNET_SERVICE_Handle *server)
-{
-  cfg = c;
-
-  if (GNUNET_OK != RECLAIM_TICKETS_init (cfg))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to initialize TICKETS subsystem.\n");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  // Connect to identity and namestore services
-  nsh = GNUNET_NAMESTORE_connect (cfg);
-  if (NULL == nsh)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                         "error connecting to namestore");
-  }
-
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
-}
-
-
-/**
- * Called whenever a client is disconnected.
- *
- * @param cls closure
- * @param client identification of the client
- * @param app_ctx @a client
- */
-static void
-client_disconnect_cb (void *cls,
-                      struct GNUNET_SERVICE_Client *client,
-                      void *app_ctx)
-{
-  struct IdpClient *idp = app_ctx;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p disconnected\n", client);
-  GNUNET_CONTAINER_DLL_remove (client_list_head,
-                               client_list_tail,
-                               idp);
-  cleanup_client (idp);
-}
-
-
-/**
- * Add a client to our list of active clients.
- *
- * @param cls NULL
- * @param client client to add
- * @param mq message queue for @a client
- * @return internal namestore client structure for this client
- */
-static void *
-client_connect_cb (void *cls,
-                   struct GNUNET_SERVICE_Client *client,
-                   struct GNUNET_MQ_Handle *mq)
-{
-  struct IdpClient *idp;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected\n", client);
-  idp = GNUNET_new (struct IdpClient);
-  idp->client = client;
-  idp->mq = mq;
-  GNUNET_CONTAINER_DLL_insert (client_list_head,
-                               client_list_tail,
-                               idp);
-  return idp;
-}
-
-
-/**
- * Define "main" method using service macro.
- */
-GNUNET_SERVICE_MAIN (
-  "reclaim",
-  GNUNET_SERVICE_OPTION_NONE,
-  &run,
-  &client_connect_cb,
-  &client_disconnect_cb,
-  NULL,
-  GNUNET_MQ_hd_var_size (attribute_store_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE,
-                         struct AttributeStoreMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (credential_store_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_STORE,
-                         struct AttributeStoreMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (attribute_delete_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_DELETE,
-                         struct AttributeDeleteMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (credential_delete_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_DELETE,
-                         struct AttributeDeleteMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (iteration_start,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START,
-                         struct AttributeIterationStartMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (iteration_next,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT,
-                           struct AttributeIterationNextMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (iteration_stop,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP,
-                           struct AttributeIterationStopMessage,
-                           NULL),
-  GNUNET_MQ_hd_var_size (credential_iteration_start,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_ITERATION_START,
-                         struct CredentialIterationStartMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (credential_iteration_next,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_ITERATION_NEXT,
-                           struct CredentialIterationNextMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (credential_iteration_stop,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_ITERATION_STOP,
-                           struct CredentialIterationStopMessage,
-                           NULL),
-
-  GNUNET_MQ_hd_var_size (issue_ticket_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET,
-                         struct IssueTicketMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (consume_ticket_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET,
-                         struct ConsumeTicketMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (ticket_iteration_start,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START,
-                         struct TicketIterationStartMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (ticket_iteration_next,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT,
-                           struct TicketIterationNextMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (ticket_iteration_stop,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP,
-                           struct TicketIterationStopMessage,
-                           NULL),
-  GNUNET_MQ_hd_var_size (revoke_ticket_message,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET,
-                         struct RevokeTicketMessage,
-                         NULL),
-  GNUNET_MQ_handler_end ());
-/* end of gnunet-service-reclaim.c */
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
deleted file mode 100644
index 689fbc429..000000000
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ /dev/null
@@ -1,1894 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author Martin Schanzenbach
- * @file src/reclaim/gnunet-service-reclaim_tickets.c
- * @brief reclaim tickets
- *
- */
-#include "platform.h"
-#include <inttypes.h>
-#include "gnunet-service-reclaim_tickets.h"
-
-
-/**
- * FIXME: the default ticket iteration interval should probably
- * be the minimim attribute expiration.
- */
-#define DEFAULT_TICKET_REFRESH_INTERVAL GNUNET_TIME_UNIT_HOURS
-
-/**
- * Handle for a parallel GNS lookup job
- * (Declaration further below)
- */
-struct ParallelLookup;
-
-
-/**
- * A reference to a ticket stored in GNS
- */
-struct TicketReference
-{
-  /**
-   * DLL
-   */
-  struct TicketReference *next;
-
-  /**
-   * DLL
-   */
-  struct TicketReference *prev;
-
-  /**
-   * Attributes
-   */
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-
-  /**
-   * Tickets
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-};
-
-
-/**
- * Handle to a consume operation
- */
-struct RECLAIM_TICKETS_ConsumeHandle
-{
-  /**
-   * Ticket
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-
-  /**
-   * LookupRequest
-   */
-  struct GNUNET_GNS_LookupRequest *lookup_request;
-
-  /**
-   * Audience Key
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * Audience Key
-   */
-  struct GNUNET_CRYPTO_PublicKey identity_pub;
-
-  /**
-   * Lookup DLL
-   */
-  struct ParallelLookup *parallel_lookups_head;
-
-  /**
-   * Lookup DLL
-   */
-  struct ParallelLookup *parallel_lookups_tail;
-
-  /**
-   * Kill task
-   */
-  struct GNUNET_SCHEDULER_Task *kill_task;
-
-  /**
-   * Attributes
-   */
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-
-  /**
-   * Presentations
-   */
-  struct GNUNET_RECLAIM_PresentationList *presentations;
-
-  /**
-   * Lookup time
-   */
-  struct GNUNET_TIME_Absolute lookup_start_time;
-
-  /**
-   * Callback
-   */
-  RECLAIM_TICKETS_ConsumeCallback cb;
-
-  /**
-   * Callback closure
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Handle for a parallel GNS lookup job
- */
-struct ParallelLookup
-{
-  /* DLL */
-  struct ParallelLookup *next;
-
-  /* DLL */
-  struct ParallelLookup *prev;
-
-  /* The GNS request */
-  struct GNUNET_GNS_LookupRequest *lookup_request;
-
-  /* The handle the return to */
-  struct RECLAIM_TICKETS_ConsumeHandle *handle;
-
-  /**
-   * Lookup time
-   */
-  struct GNUNET_TIME_Absolute lookup_start_time;
-
-  /* The label to look up */
-  char *label;
-};
-
-
-/**
- * Ticket issue request handle
- */
-struct TicketIssueHandle
-{
-  /**
-   * Attributes to issue
-   */
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-
-  /**
-   * Presentations to add
-   */
-  struct GNUNET_RECLAIM_PresentationList *presentations;
-
-  /**
-   * Issuer Key
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * Ticket to issue
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-
-  /**
-   * QueueEntry
-   */
-  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
-
-  /**
-   * Namestore Iterator
-   */
-  struct GNUNET_NAMESTORE_ZoneIterator *ns_it;
-
-  /**
-   * Callback
-   */
-  RECLAIM_TICKETS_TicketResult cb;
-
-  /**
-   * Callback cls
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Ticket iterator
- */
-struct RECLAIM_TICKETS_Iterator
-{
-  /**
-   * Namestore queue entry
-   */
-  struct GNUNET_NAMESTORE_ZoneIterator *ns_it;
-
-  /**
-   * Iter callback
-   */
-  RECLAIM_TICKETS_TicketIter cb;
-
-  /**
-   * Iter cls
-   */
-  void *cb_cls;
-};
-
-
-struct RevokedAttributeEntry
-{
-  /**
-   * DLL
-   */
-  struct RevokedAttributeEntry *next;
-
-  /**
-   * DLL
-   */
-  struct RevokedAttributeEntry *prev;
-
-  /**
-   * Old ID of the attribute
-   */
-  struct GNUNET_RECLAIM_Identifier old_id;
-
-  /**
-   * New ID of the attribute
-   */
-  struct GNUNET_RECLAIM_Identifier new_id;
-};
-
-
-/**
- * Ticket revocation request handle
- */
-struct RECLAIM_TICKETS_RevokeHandle
-{
-  /**
-   * Issuer Key
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * Callback
-   */
-  RECLAIM_TICKETS_RevokeCallback cb;
-
-  /**
-   * Callback cls
-   */
-  void *cb_cls;
-
-  /**
-   * Ticket to issue
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-
-  /**
-   * QueueEntry
-   */
-  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
-
-  /**
-   * Namestore iterator
-   */
-  struct GNUNET_NAMESTORE_ZoneIterator *ns_it;
-
-  /**
-   * Revoked attributes
-   */
-  struct RevokedAttributeEntry *attrs_head;
-
-  /**
-   * Revoked attributes
-   */
-  struct RevokedAttributeEntry *attrs_tail;
-
-  /**
-   * Current attribute to move
-   */
-  struct RevokedAttributeEntry *move_attr;
-
-  /**
-   * Number of attributes in ticket
-   */
-  unsigned int ticket_attrs;
-
-  /**
-   * Tickets to update
-   */
-  struct TicketRecordsEntry *tickets_to_update_head;
-
-  /**
-   * Tickets to update
-   */
-  struct TicketRecordsEntry *tickets_to_update_tail;
-};
-
-
-/**
- * Ticket expiration interval
- */
-static struct GNUNET_TIME_Relative ticket_refresh_interval;
-
-
-/* Namestore handle */
-static struct GNUNET_NAMESTORE_Handle *nsh;
-
-
-/* GNS handle */
-static struct GNUNET_GNS_Handle *gns;
-
-
-/* Handle to the statistics service */
-static struct GNUNET_STATISTICS_Handle *stats;
-
-
-/**
- * Cleanup revoke handle
- *
- * @param rh the ticket revocation handle
- */
-static void
-cleanup_rvk (struct RECLAIM_TICKETS_RevokeHandle *rh)
-{
-  struct RevokedAttributeEntry *ae;
-  struct TicketRecordsEntry *le;
-
-  if (NULL != rh->ns_qe)
-    GNUNET_NAMESTORE_cancel (rh->ns_qe);
-  if (NULL != rh->ns_it)
-    GNUNET_NAMESTORE_zone_iteration_stop (rh->ns_it);
-  while (NULL != (ae = rh->attrs_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (rh->attrs_head, rh->attrs_tail, ae);
-    GNUNET_free (ae);
-  }
-  while (NULL != (le = rh->tickets_to_update_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (rh->tickets_to_update_head,
-                                 rh->tickets_to_update_head,
-                                 le);
-    if (NULL != le->data)
-      GNUNET_free (le->data);
-    if (NULL != le->label)
-      GNUNET_free (le->label);
-    GNUNET_free (le);
-  }
-  GNUNET_free (rh);
-}
-
-
-/**
- * For each ticket, store new, updated attribute references
- * (Implementation further below)
- *
- * @param cls handle to the operation
- */
-static void
-process_tickets (void *cls);
-
-
-/**
- * Finished storing updated attribute references.
- * Abort on error, else continue processing tickets
- *
- * @param cls handle to the operation
- * @param success result of namestore operation
- * @param emsg (NULL on success)
- */
-static void
-ticket_processed (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->ns_qe = NULL;
-  GNUNET_SCHEDULER_add_now (&process_tickets, rvk);
-}
-
-
-/**
- * For each ticket, store new, updated attribute references
- *
- * @param cls handle to the operation
- */
-static void
-process_tickets (void *cls)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-  struct TicketRecordsEntry *le;
-  struct RevokedAttributeEntry *ae;
-
-  if (NULL == rvk->tickets_to_update_head)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Finished updatding tickets, success\n");
-    rvk->cb (rvk->cb_cls, GNUNET_OK);
-    cleanup_rvk (rvk);
-    return;
-  }
-  le = rvk->tickets_to_update_head;
-  GNUNET_CONTAINER_DLL_remove (rvk->tickets_to_update_head,
-                               rvk->tickets_to_update_tail,
-                               le);
-  struct GNUNET_GNSRECORD_Data rd[le->rd_count];
-  if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (le->data_size,
-                                                         le->data,
-                                                         le->rd_count,
-                                                         rd))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to deserialize ticket record(s)\n");
-    rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-    cleanup_rvk (rvk);
-    return;
-  }
-  for (int i = 0; i < le->rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF != rd[i].record_type)
-      continue;
-    for (ae = rvk->attrs_head; NULL != ae; ae = ae->next)
-    {
-      if (0 != memcmp (rd[i].data, &ae->old_id, sizeof(ae->old_id)))
-        continue;
-      rd[i].data = &ae->new_id;
-    }
-  }
-  rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &rvk->identity,
-                                               le->label,
-                                               le->rd_count,
-                                               rd,
-                                               &ticket_processed,
-                                               rvk);
-  GNUNET_free (le->label);
-  GNUNET_free (le->data);
-  GNUNET_free (le);
-}
-
-
-/**
- * Done collecting tickets. Start processing.
- *
- * @param cls handle to the operation
- */
-static void
-rvk_ticket_update_finished (void *cls)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->ns_it = NULL;
-  GNUNET_SCHEDULER_add_now (&process_tickets, rvk);
-}
-
-
-/**
- * We need to update all other tickets with the new attribute IDs.
- * We first collect them all. Processing after.
- *
- * @param cls handle to the operation
- * @param zone ticket issuer private key
- * @param label ticket rnd
- * @param rd_count size of record set
- * @param rd record set
- */
-static void
-rvk_ticket_update (void *cls,
-                   const struct GNUNET_CRYPTO_PrivateKey *zone,
-                   const char *label,
-                   unsigned int rd_count,
-                   const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-  struct TicketRecordsEntry *le;
-  struct RevokedAttributeEntry *ae;
-  int has_changed = GNUNET_NO;
-
-  /** Let everything point to the old record **/
-  for (int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF != rd[i].record_type)
-      continue;
-    for (ae = rvk->attrs_head; NULL != ae; ae = ae->next)
-    {
-      if (0 != memcmp (rd[i].data, &ae->old_id, sizeof(ae->old_id)))
-        continue;
-      has_changed = GNUNET_YES;
-      break;
-    }
-    if (GNUNET_YES == has_changed)
-      break;
-  }
-  if (GNUNET_YES == has_changed)
-  {
-    le = GNUNET_new (struct TicketRecordsEntry);
-    le->data_size = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
-    le->data = GNUNET_malloc (le->data_size);
-    le->rd_count = rd_count;
-    le->label = GNUNET_strdup (label);
-    GNUNET_GNSRECORD_records_serialize (rd_count, rd, le->data_size, le->data);
-    GNUNET_CONTAINER_DLL_insert (rvk->tickets_to_update_head,
-                                 rvk->tickets_to_update_tail,
-                                 le);
-  }
-  GNUNET_NAMESTORE_zone_iterator_next (rvk->ns_it, 1);
-}
-
-
-/**
- * Error iterating namestore. Abort.
- *
- * @param cls handle to the operation
- */
-static void
-rvk_ns_iter_err (void *cls)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->ns_it = NULL;
-  rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-  cleanup_rvk (rvk);
-}
-
-
-/**
- * Error storing new attribute in namestore. Abort
- *
- * @param cls handle to the operation
- */
-static void
-rvk_ns_err (void *cls)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->ns_qe = NULL;
-  rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-  cleanup_rvk (rvk);
-}
-
-
-/**
- * We change every attribute ID of the ticket attributes we
- * want to revoke.
- * When we are done, we need to update any other ticket which
- * included references to any of the changed attributes.
- *
- * @param rh handle to the operation
- */
-static void
-move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rh);
-
-
-/**
- * Delayed continuation for move_attrs
- *
- * @param cls handle to the operation.
- */
-static void
-move_attrs_cont (void *cls)
-{
-  move_attrs ((struct RECLAIM_TICKETS_RevokeHandle *) cls);
-}
-
-
-/**
- * Done deleting the old record. Abort on error.
- * Else, continue updating attribute IDs.
- *
- * @param cls handle to the operation
- * @param success result of the namestore operation
- * @param emsg error message (NULL on success)
- */
-static void
-del_attr_finished (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error removing attribute: %s\n",
-                GNUNET_ErrorCode_get_hint (ec));
-    rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-    cleanup_rvk (rvk);
-    return;
-  }
-  rvk->move_attr = rvk->move_attr->next;
-  GNUNET_SCHEDULER_add_now (&move_attrs_cont, rvk);
-}
-
-
-/**
- * Updated an attribute ID.
- * Abort on error if namestore operation failed.
- * Else, we have to delete the old record.
- *
- * @param cls handle to the operation
- * @param success result of the store operation
- * @param emsg error message (NULL on success)
- */
-static void
-move_attr_finished (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-  char *label;
-
-  rvk->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error moving attribute: %s\n",
-                GNUNET_ErrorCode_get_hint (ec));
-    rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-    cleanup_rvk (rvk);
-    return;
-  }
-  label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->old_id,
-                                               sizeof(rvk->move_attr->old_id));
-  GNUNET_assert (NULL != label);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing attribute %s\n", label);
-  rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &rvk->identity,
-                                               label,
-                                               0,
-                                               NULL,
-                                               &del_attr_finished,
-                                               rvk);
-  GNUNET_free (label);
-}
-
-
-/**
- * Got the referenced attribute. Updating the ID
- *
- * @param cls handle to the operation
- * @param zone issuer identity
- * @param label attribute ID
- * @param rd_count size of record set (should be 1)
- * @param rd record set (the attribute)
- */
-static void
-rvk_move_attr_cb (void *cls,
-                  const struct GNUNET_CRYPTO_PrivateKey *zone,
-                  const char *label,
-                  unsigned int rd_count,
-                  const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-  struct GNUNET_GNSRECORD_Data new_rd[rd_count];
-  struct RevokedAttributeEntry *le;
-  char *new_label;
-  char *attr_data;
-
-  rvk->ns_qe = NULL;
-  if (0 == rd_count)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "The claim %s no longer exists!\n",
-                label);
-    le = rvk->move_attr;
-    rvk->move_attr = le->next;
-    GNUNET_CONTAINER_DLL_remove (rvk->attrs_head, rvk->attrs_tail, le);
-    GNUNET_free (le);
-    GNUNET_SCHEDULER_add_now (&move_attrs_cont, rvk);
-    return;
-  }
-  GNUNET_RECLAIM_id_generate (&rvk->move_attr->new_id);
-  new_label =
-    GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->new_id,
-                                         sizeof (rvk->move_attr->new_id));
-
-  attr_data = NULL;
-  // new_rd = *rd;
-  for (int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE == rd[i].record_type)
-    {
-      /** find a new place for this attribute **/
-      struct GNUNET_RECLAIM_Attribute *claim;
-      GNUNET_RECLAIM_attribute_deserialize (rd[i].data,
-                                            rd[i].data_size,
-                                            &claim);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Attribute to update: Name=%s\n",
-                  claim->name);
-      claim->id = rvk->move_attr->new_id;
-      new_rd[i].data_size = GNUNET_RECLAIM_attribute_serialize_get_size (claim);
-      attr_data = GNUNET_malloc (rd[i].data_size);
-      new_rd[i].data_size = GNUNET_RECLAIM_attribute_serialize (claim,
-                                                                attr_data);
-      new_rd[i].data = attr_data;
-      new_rd[i].record_type = rd[i].record_type;
-      new_rd[i].flags = rd[i].flags;
-      new_rd[i].expiration_time = rd[i].expiration_time;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding attribute %s\n", new_label);
-      GNUNET_free (claim);
-    }
-    else if (GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL == rd[i].record_type)
-    {
-      struct GNUNET_RECLAIM_Credential *credential;
-      credential = GNUNET_RECLAIM_credential_deserialize (rd[i].data,
-                                                          rd[i].data_size);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Credential to update: Name=%s\n",
-                  credential->name);
-      credential->id = rvk->move_attr->new_id;
-      new_rd[i].data_size =
-        GNUNET_RECLAIM_credential_serialize_get_size (credential);
-      attr_data = GNUNET_malloc (rd[i].data_size);
-      new_rd[i].data_size = GNUNET_RECLAIM_credential_serialize (credential,
-                                                                 attr_data);
-      new_rd[i].data = attr_data;
-      new_rd[i].record_type = rd[i].record_type;
-      new_rd[i].flags = rd[i].flags;
-      new_rd[i].expiration_time = rd[i].expiration_time;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding credential %s\n",
-                  new_label);
-      GNUNET_free (credential);
-    }
-    else {
-      memcpy (&new_rd[i], &rd[i], sizeof (struct GNUNET_GNSRECORD_Data));
-    }
-  }
-  rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &rvk->identity,
-                                               new_label,
-                                               rd_count,
-                                               new_rd,
-                                               &move_attr_finished,
-                                               rvk);
-  GNUNET_free (new_label);
-  GNUNET_free (attr_data);
-}
-
-
-static void
-move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rvk)
-{
-  char *label;
-
-  if (NULL == rvk->move_attr)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished moving attributes\n");
-    rvk->ns_it =
-      GNUNET_NAMESTORE_zone_iteration_start (nsh,
-                                             &rvk->identity,
-                                             &rvk_ns_iter_err,
-                                             rvk,
-                                             &rvk_ticket_update,
-                                             rvk,
-                                             &rvk_ticket_update_finished,
-                                             rvk);
-    return;
-  }
-  label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->old_id,
-                                               sizeof (rvk->move_attr->old_id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Moving claim %s\n", label);
-
-  rvk->ns_qe = GNUNET_NAMESTORE_records_lookup (nsh,
-                                                &rvk->identity,
-                                                label,
-                                                &rvk_ns_err,
-                                                rvk,
-                                                &rvk_move_attr_cb,
-                                                rvk);
-  GNUNET_free (label);
-}
-
-
-/**
- * Finished deleting ticket and attribute references.
- * Abort on failure.
- * Else, we start changing every attribute ID in the
- * found attribute references so that access is no longer
- * possible.
- *
- * @param cls handle to the operation
- * @param success Namestore operation return value
- * @param emsg error message (NULL on success)
- */
-static void
-remove_ticket_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n",
-                GNUNET_ErrorCode_get_hint (ec));
-    rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-    cleanup_rvk (rvk);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleted ticket\n");
-  if (0 == rvk->ticket_attrs)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "No attributes to move... strange\n");
-    rvk->cb (rvk->cb_cls, GNUNET_OK);
-    cleanup_rvk (rvk);
-    return;
-  }
-  rvk->move_attr = rvk->attrs_head;
-  move_attrs (rvk);
-}
-
-
-/**
- * We found the attribute references.
- * Store them for later and remove the record set.
- *
- * @param cls handle to the operation
- * @param zone the issuer key
- * @param label ticket rnd
- * @param rd_count size of record set
- * @param rd record set
- */
-static void
-revoke_attrs_cb (void *cls,
-                 const struct GNUNET_CRYPTO_PrivateKey *zone,
-                 const char *label,
-                 unsigned int rd_count,
-                 const struct GNUNET_GNSRECORD_Data *rd)
-
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-  struct RevokedAttributeEntry *le;
-
-  rvk->ns_qe = NULL;
-  /**
-   * Temporarily store attribute references.
-   * We need it later.
-   */
-  for (int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF != rd[i].record_type)
-      continue;
-    le = GNUNET_new (struct RevokedAttributeEntry);
-    le->old_id = *((struct GNUNET_RECLAIM_Identifier *) rd[i].data);
-    GNUNET_CONTAINER_DLL_insert (rvk->attrs_head, rvk->attrs_tail, le);
-    rvk->ticket_attrs++;
-  }
-
-  /** Remove attribute references **/
-  rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                               &rvk->identity,
-                                               label,
-                                               0,
-                                               NULL,
-                                               &remove_ticket_cont,
-                                               rvk);
-}
-
-
-/**
- * Failed to query namestore. Abort operation
- *
- * @param cls handle to the operation
- */
-static void
-rvk_attrs_err_cb (void *cls)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
-
-  rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
-  cleanup_rvk (rvk);
-}
-
-
-/**
- * Revoke a ticket.
- * We start by looking up attribute references in order
- * to change attribute IDs.
- *
- * @param ticket ticket to revoke
- * @param identity private key of issuer
- * @param cb revocation status callback
- * @param cb_cls callback closure
- * @return handle to the operation
- */
-struct RECLAIM_TICKETS_RevokeHandle *
-RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket,
-                        const struct GNUNET_CRYPTO_PrivateKey *identity,
-                        RECLAIM_TICKETS_RevokeCallback cb,
-                        void *cb_cls)
-{
-  struct RECLAIM_TICKETS_RevokeHandle *rvk;
-  char *label;
-
-  rvk = GNUNET_new (struct RECLAIM_TICKETS_RevokeHandle);
-  rvk->cb = cb;
-  rvk->cb_cls = cb_cls;
-  rvk->identity = *identity;
-  rvk->ticket = *ticket;
-  GNUNET_CRYPTO_key_get_public (&rvk->identity, &rvk->ticket.identity);
-  /** Get shared attributes **/
-  label = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd,
-                                               sizeof(ticket->rnd));
-  GNUNET_assert (NULL != label);
-  rvk->ns_qe = GNUNET_NAMESTORE_records_lookup (nsh,
-                                                identity,
-                                                label,
-                                                &rvk_attrs_err_cb,
-                                                rvk,
-                                                &revoke_attrs_cb,
-                                                rvk);
-  GNUNET_free (label);
-  return rvk;
-}
-
-
-/**
- * Cancel a revocation.
- *
- * @param rh handle to the operation
- */
-void
-RECLAIM_TICKETS_revoke_cancel (struct RECLAIM_TICKETS_RevokeHandle *rh)
-{
-  GNUNET_assert (NULL != rh);
-  cleanup_rvk (rh);
-}
-
-
-/*******************************
-* Ticket consume
-*******************************/
-
-/**
- * Cleanup ticket consume handle
- *
- * @param cth the handle to clean up
- */
-static void
-cleanup_cth (struct RECLAIM_TICKETS_ConsumeHandle *cth)
-{
-  struct ParallelLookup *lu;
-
-  if (NULL != cth->lookup_request)
-    GNUNET_GNS_lookup_cancel (cth->lookup_request);
-  if (NULL != cth->kill_task)
-    GNUNET_SCHEDULER_cancel (cth->kill_task);
-  while (NULL != (lu = cth->parallel_lookups_head))
-  {
-    if (NULL != lu->lookup_request)
-      GNUNET_GNS_lookup_cancel (lu->lookup_request);
-    GNUNET_free (lu->label);
-    GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head,
-                                 cth->parallel_lookups_tail,
-                                 lu);
-    GNUNET_free (lu);
-  }
-
-  if (NULL != cth->attrs)
-    GNUNET_RECLAIM_attribute_list_destroy (cth->attrs);
-  if (NULL != cth->presentations)
-    GNUNET_RECLAIM_presentation_list_destroy (cth->presentations);
-  GNUNET_free (cth);
-}
-
-
-/**
- * We found an attribute record.
- *
- * @param cls handle to the operation
- * @param rd_count size of record set
- * @param rd record set
- */
-static void
-process_parallel_lookup_result (void *cls,
-                                uint32_t rd_count,
-                                const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct ParallelLookup *parallel_lookup = cls;
-  struct RECLAIM_TICKETS_ConsumeHandle *cth = parallel_lookup->handle;
-  struct GNUNET_RECLAIM_AttributeListEntry *attr_le;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Parallel lookup finished (count=%u)\n",
-              rd_count);
-
-  GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head,
-                               cth->parallel_lookups_tail,
-                               parallel_lookup);
-  GNUNET_free (parallel_lookup->label);
-
-  GNUNET_STATISTICS_update (stats,
-                            "attribute_lookup_time_total",
-                            GNUNET_TIME_absolute_get_duration (
-                              parallel_lookup->lookup_start_time)
-                            .rel_value_us,
-                            GNUNET_YES);
-  GNUNET_STATISTICS_update (stats, "attribute_lookups_count", 1, GNUNET_YES);
-
-
-  GNUNET_free (parallel_lookup);
-  if (0 == rd_count)
-    GNUNET_break (0);
-  // REMARK: It is possible now to find rd_count > 1
-  for (int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE != rd[i].record_type)
-      continue;
-    attr_le = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    GNUNET_RECLAIM_attribute_deserialize (rd[i].data, rd[i].data_size,
-                                          &attr_le->attribute);
-    GNUNET_CONTAINER_DLL_insert (cth->attrs->list_head,
-                                 cth->attrs->list_tail,
-                                 attr_le);
-  }
-  if (NULL != cth->parallel_lookups_head)
-    return; // Wait for more
-  /* Else we are done */
-  cth->cb (cth->cb_cls, &cth->ticket.identity,
-           cth->attrs, cth->presentations, GNUNET_OK, NULL);
-  cleanup_cth (cth);
-}
-
-
-/**
- * Cancel the lookups for attribute records
- *
- * @param cls handle to the operation
- */
-static void
-abort_parallel_lookups (void *cls)
-{
-  struct RECLAIM_TICKETS_ConsumeHandle *cth = cls;
-  struct ParallelLookup *lu;
-  struct ParallelLookup *tmp;
-
-  cth->kill_task = NULL;
-  for (lu = cth->parallel_lookups_head; NULL != lu;)
-  {
-    GNUNET_GNS_lookup_cancel (lu->lookup_request);
-    GNUNET_free (lu->label);
-    tmp = lu->next;
-    GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head,
-                                 cth->parallel_lookups_tail,
-                                 lu);
-    GNUNET_free (lu);
-    lu = tmp;
-  }
-  cth->cb (cth->cb_cls, NULL, NULL, NULL, GNUNET_SYSERR, "Aborted");
-}
-
-
-/**
- * GNS result with attribute references.
- * For each result, we start a (parallel) lookup of the actual
- * attribute record under the referenced label.
- *
- * @param cls handle to the operation
- * @param rd_count size of the record set
- * @param rd record set
- */
-static void
-lookup_authz_cb (void *cls,
-                 uint32_t rd_count,
-                 const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct RECLAIM_TICKETS_ConsumeHandle *cth = cls;
-  struct ParallelLookup *parallel_lookup;
-  char *lbl;
-  struct GNUNET_RECLAIM_PresentationListEntry *ale;
-
-  cth->lookup_request = NULL;
-
-  GNUNET_STATISTICS_update (stats,
-                            "reclaim_authz_lookup_time_total",
-                            GNUNET_TIME_absolute_get_duration (
-                              cth->lookup_start_time)
-                            .rel_value_us,
-                            GNUNET_YES);
-  GNUNET_STATISTICS_update (stats,
-                            "reclaim_authz_lookups_count",
-                            1,
-                            GNUNET_YES);
-
-  for (int i = 0; i < rd_count; i++)
-  {
-    /**
-     * Check if record is a credential presentation or an attribute
-     * reference.
-     */
-    switch (rd[i].record_type)
-    {
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION:
-      ale = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-      ale->presentation =
-        GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
-                                                 rd[i].data_size);
-      GNUNET_CONTAINER_DLL_insert (cth->presentations->list_head,
-                                   cth->presentations->list_tail,
-                                   ale);
-      break;
-    case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF:
-      lbl = GNUNET_STRINGS_data_to_string_alloc (rd[i].data, rd[i].data_size);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ticket reference found %s\n", lbl);
-      parallel_lookup = GNUNET_new (struct ParallelLookup);
-      parallel_lookup->handle = cth;
-      parallel_lookup->label = lbl;
-      parallel_lookup->lookup_start_time = GNUNET_TIME_absolute_get ();
-      parallel_lookup->lookup_request =
-        GNUNET_GNS_lookup (gns,
-                           lbl,
-                           &cth->ticket.identity,
-                           GNUNET_GNSRECORD_TYPE_ANY,
-                           GNUNET_GNS_LO_DEFAULT,
-                           &process_parallel_lookup_result,
-                           parallel_lookup);
-      GNUNET_CONTAINER_DLL_insert (cth->parallel_lookups_head,
-                                   cth->parallel_lookups_tail,
-                                   parallel_lookup);
-      break;
-    default:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Ignoring unknown record type %d", rd[i].record_type);
-    }
-  }
-  /**
-   * We started lookups. Add a timeout task.
-   * FIXME: Really needed here?
-   */
-  if (NULL != cth->parallel_lookups_head)
-  {
-    cth->kill_task = GNUNET_SCHEDULER_add_delayed (
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 3),
-      &abort_parallel_lookups,
-      cth);
-    return;
-  }
-  /**
-   * No references found, return empty attribute list
-   */
-  cth->cb (cth->cb_cls, &cth->ticket.identity,
-           cth->attrs, NULL, GNUNET_OK, NULL);
-  cleanup_cth (cth);
-}
-
-
-/**
- * Consume a ticket.
- * We first looking attribute references under the label
- * ticket.rnd in GNS.
- *
- * @param id the audience of the ticket
- * @param ticket the ticket to consume
- * @param cb callback to call with attributes of ticket
- * @param cb_cls callback closure
- * @return handle to the operation
- */
-struct RECLAIM_TICKETS_ConsumeHandle *
-RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_PrivateKey *id,
-                         const struct GNUNET_RECLAIM_Ticket *ticket,
-                         RECLAIM_TICKETS_ConsumeCallback cb,
-                         void *cb_cls)
-{
-  struct RECLAIM_TICKETS_ConsumeHandle *cth;
-  char *label;
-
-  cth = GNUNET_new (struct RECLAIM_TICKETS_ConsumeHandle);
-
-  cth->identity = *id;
-  GNUNET_CRYPTO_key_get_public (&cth->identity, &cth->identity_pub);
-  cth->attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  cth->presentations = GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
-  cth->ticket = *ticket;
-  cth->cb = cb;
-  cth->cb_cls = cb_cls;
-  label =
-    GNUNET_STRINGS_data_to_string_alloc (&cth->ticket.rnd,
-                                         sizeof(cth->ticket.rnd));
-  char *str = GNUNET_CRYPTO_public_key_to_string (&cth->ticket.identity);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Looking for AuthZ info under %s in %s\n",
-              label, str);
-  GNUNET_free (str);
-  cth->lookup_start_time = GNUNET_TIME_absolute_get ();
-  cth->lookup_request =
-    GNUNET_GNS_lookup (gns,
-                       label,
-                       &cth->ticket.identity,
-                       GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF,
-                       GNUNET_GNS_LO_DEFAULT,
-                       &lookup_authz_cb,
-                       cth);
-  GNUNET_free (label);
-  return cth;
-}
-
-
-/**
- * Cancel a consume operation
- *
- * @param cth the operation to cancel
- */
-void
-RECLAIM_TICKETS_consume_cancel (struct RECLAIM_TICKETS_ConsumeHandle *cth)
-{
-  cleanup_cth (cth);
-  return;
-}
-
-
-/*******************************
- * Ticket issue
- *******************************/
-
-/**
- * Cleanup ticket consume handle
- * @param handle the handle to clean up
- */
-static void
-cleanup_issue_handle (struct TicketIssueHandle *handle)
-{
-  if (NULL != handle->ns_qe)
-    GNUNET_NAMESTORE_cancel (handle->ns_qe);
-  GNUNET_free (handle);
-}
-
-
-/**
- * Store finished, abort on error.
- * Else, return new ticket to caller.
- *
- * @param cls handle to the operation
- * @param success store operation result
- * @param emsg error message (or NULL on success)
- */
-static void
-store_ticket_issue_cont (void *cls, enum GNUNET_ErrorCode ec)
-{
-  struct TicketIssueHandle *handle = cls;
-
-  handle->ns_qe = NULL;
-  if (GNUNET_EC_NONE != ec)
-  {
-    handle->cb (handle->cb_cls,
-                &handle->ticket,
-                NULL,
-                GNUNET_SYSERR,
-                "Error storing AuthZ ticket in GNS");
-    return;
-  }
-  handle->cb (handle->cb_cls,
-              &handle->ticket,
-              handle->presentations,
-              GNUNET_OK, NULL);
-  cleanup_issue_handle (handle);
-}
-
-
-/**
- * Issue a new ticket.
- * We store references to attribute record labels and the ticket itself
- * under the label base64(ticket.rnd).
- *
- * @param ih handle to the operation containing relevant metadata
- */
-static void
-issue_ticket (struct TicketIssueHandle *ih)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  struct GNUNET_RECLAIM_PresentationListEntry *ple;
-  struct GNUNET_GNSRECORD_Data *attrs_record;
-  char *label;
-  char *tkt_data;
-  int i;
-  int j;
-  int attrs_count = 0;
-
-  for (le = ih->attrs->list_head; NULL != le; le = le->next)
-    attrs_count++;
-
-  // Worst case we have one presentation per attribute
-  attrs_record =
-    GNUNET_malloc (2 * attrs_count * sizeof(struct GNUNET_GNSRECORD_Data));
-  i = 0;
-  for (le = ih->attrs->list_head; NULL != le; le = le->next)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Adding list entry: %s\n", le->attribute->name);
-
-    attrs_record[i].data = &le->attribute->id;
-    attrs_record[i].data_size = sizeof(le->attribute->id);
-    attrs_record[i].expiration_time = ticket_refresh_interval.rel_value_us;
-    attrs_record[i].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF;
-    attrs_record[i].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-    i++;
-    if (GNUNET_NO == GNUNET_RECLAIM_id_is_zero (&le->attribute->credential))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Attribute is backed by credential. Adding...\n");
-      struct GNUNET_RECLAIM_Presentation *presentation = NULL;
-      for (j = 0; j < i; j++)
-      {
-        if (attrs_record[j].record_type
-            != GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION)
-          continue;
-        presentation = GNUNET_RECLAIM_presentation_deserialize (
-          attrs_record[j].data,
-          attrs_record[j].
-          data_size);
-        if (NULL == presentation)
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                      "Failed to deserialize presentation\n");
-          continue;
-        }
-        if (0 == memcmp (&presentation->credential_id,
-                         &le->attribute->credential,
-                         sizeof (le->attribute->credential)))
-          break;
-        GNUNET_free (presentation);
-        presentation = NULL;
-      }
-      if (NULL != presentation)
-      {
-        GNUNET_free (presentation);
-        continue; // Skip as we have already added this credential presentation.
-      }
-      for (ple = ih->presentations->list_head; NULL != ple; ple = ple->next)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Checking presentation....\n");
-
-        if (0 != memcmp (&le->attribute->credential,
-                         &ple->presentation->credential_id,
-                         sizeof (le->attribute->credential)))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Presentation does not match credential ID.\n");
-          continue;
-        }
-        char *pres_buf;
-        size_t pres_size;
-
-        pres_size =
-          GNUNET_RECLAIM_presentation_serialize_get_size (ple->presentation);
-        pres_buf = GNUNET_malloc (pres_size);
-        GNUNET_RECLAIM_presentation_serialize (ple->presentation,
-                                               pres_buf);
-        attrs_record[i].data = pres_buf;
-        attrs_record[i].data_size = pres_size;
-        attrs_record[i].expiration_time =
-          ticket_refresh_interval.rel_value_us;
-        attrs_record[i].record_type =
-          GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION;
-        attrs_record[i].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-        i++;
-        break;
-      }
-    }
-  }
-  attrs_record[i].data_size =
-    GNUNET_RECLAIM_ticket_serialize_get_size (&ih->ticket);
-  tkt_data = GNUNET_malloc (attrs_record[i].data_size);
-  GNUNET_RECLAIM_write_ticket_to_buffer (&ih->ticket,
-                                         tkt_data,
-                                         attrs_record[i].data_size);
-  attrs_record[i].data = tkt_data;
-  attrs_record[i].expiration_time = ticket_refresh_interval.rel_value_us;
-  attrs_record[i].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET;
-  attrs_record[i].flags =
-    GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION | GNUNET_GNSRECORD_RF_PRIVATE;
-  i++;
-
-  label =
-    GNUNET_STRINGS_data_to_string_alloc (&ih->ticket.rnd,
-                                         sizeof(ih->ticket.rnd));
-  struct GNUNET_CRYPTO_PublicKey pub;
-  GNUNET_CRYPTO_key_get_public (&ih->identity,
-                                  &pub);
-  char *str = GNUNET_CRYPTO_public_key_to_string (&pub);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Storing AuthZ information under %s in %s\n", label, str);
-  GNUNET_free (str);
-  // Publish record
-  ih->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
-                                              &ih->identity,
-                                              label,
-                                              i,
-                                              attrs_record,
-                                              &store_ticket_issue_cont,
-                                              ih);
-  for (j = 0; j < i; j++)
-  {
-    if (attrs_record[j].record_type
-        != GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION)
-      continue;
-    // Yes, we are allowed to do this because we allocated it above
-    char *ptr = (char*) attrs_record[j].data;
-    GNUNET_free (ptr);
-  }
-  GNUNET_free (tkt_data);
-  GNUNET_free (attrs_record);
-  GNUNET_free (label);
-}
-
-
-/*************************************************
- * Ticket iteration (finding a specific ticket)
- *************************************************/
-
-
-/**
- * Namestore error on issue. Abort.
- *
- * @param cls handle to the operation
- */
-static void
-filter_tickets_error_cb (void *cls)
-{
-  struct TicketIssueHandle *tih = cls;
-
-  tih->ns_it = NULL;
-  tih->cb (tih->cb_cls,
-           &tih->ticket,
-           NULL,
-           GNUNET_SYSERR,
-           "Error storing AuthZ ticket in GNS");
-  cleanup_issue_handle (tih);
-}
-
-
-/**
- * Iterator over records.
- * Check if any previously issued ticket already
- * matches what we need to prevent duplicates and
- * improve resolution synergy.
- *
- * @param cls handle to the operation
- * @param zone issuer identity
- * @param label ticket rnd
- * @param rd_count size of record set
- * @param rd record set
- */
-static void
-filter_tickets_cb (void *cls,
-                   const struct GNUNET_CRYPTO_PrivateKey *zone,
-                   const char *label,
-                   unsigned int rd_count,
-                   const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct TicketIssueHandle *tih = cls;
-  struct GNUNET_RECLAIM_Ticket ticket;
-  struct GNUNET_RECLAIM_Presentation *presentation;
-  struct GNUNET_RECLAIM_PresentationList *ticket_presentations;
-  struct GNUNET_RECLAIM_Credential *cred;
-  struct GNUNET_RECLAIM_PresentationListEntry *ple;
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  unsigned int attr_cnt = 0;
-  unsigned int pres_cnt = 0;
-  int ticket_found = GNUNET_NO;
-
-  for (le = tih->attrs->list_head; NULL != le; le = le->next)
-  {
-    attr_cnt++;
-    if (GNUNET_NO == GNUNET_RECLAIM_id_is_zero (&le->attribute->credential))
-      pres_cnt++;
-  }
-
-  // ticket search
-  unsigned int found_attrs_cnt = 0;
-  unsigned int found_pres_cnt = 0;
-  size_t read;
-  ticket_presentations = GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
-
-  for (int i = 0; i < rd_count; i++)
-  {
-    // found ticket
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET == rd[i].record_type)
-    {
-      if ((GNUNET_SYSERR ==
-           GNUNET_RECLAIM_read_ticket_from_buffer (rd[i].data,
-                                                   rd[i].data_size,
-                                                   &ticket,
-                                                   &read)) ||
-          (read != rd[i].data_size))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Failed to deserialize ticket from record\n");
-        continue;
-      }
-      // cmp audience
-      // FIXME this is ugly, GNUNET_CRYPTO_PublicKey cannot be compared
-      // like this
-      if (0 == memcmp (&tih->ticket.audience,
-                       &ticket.audience,
-                       sizeof(struct GNUNET_CRYPTO_PublicKey)))
-      {
-        tih->ticket = ticket;
-        ticket_found = GNUNET_YES;
-        continue;
-      }
-    }
-
-    // cmp requested attributes with ticket attributes
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF == rd[i].record_type)
-    {
-      for (le = tih->attrs->list_head; NULL != le; le = le->next)
-      {
-        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (rd[i].data,
-                                                      &le->attribute->id))
-          found_attrs_cnt++;
-      }
-    }
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL == rd[i].record_type)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Found credential...\n");
-
-      for (le = tih->attrs->list_head; NULL != le; le = le->next)
-      {
-        cred = GNUNET_RECLAIM_credential_deserialize (rd[i].data,
-                                                      rd[i].data_size);
-        if (GNUNET_YES != GNUNET_RECLAIM_id_is_equal (&cred->id,
-                                                      &le->attribute->credential))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "No match.\n");
-          GNUNET_free (cred);
-          continue;
-        }
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Match, creating presentation...\n");
-        if (GNUNET_OK != GNUNET_RECLAIM_credential_get_presentation (
-              cred,
-              tih->attrs,
-              &presentation))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      "Unable to retrieve presentation from credential\n");
-          GNUNET_free (cred);
-          continue;
-        }
-        ple = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-        ple->presentation = presentation;
-        GNUNET_CONTAINER_DLL_insert (tih->presentations->list_head,
-                                     tih->presentations->list_tail,
-                                     ple);
-        GNUNET_free (cred);
-        break;
-      }
-    }
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION == rd[i].record_type)
-    {
-      for (le = tih->attrs->list_head; NULL != le; le = le->next)
-      {
-        presentation = GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
-                                                                rd[i].data_size);
-        if (NULL == presentation)
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                      "Failed to deserialize presentation\n");
-          continue;
-        }
-        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (
-              &presentation->credential_id,
-              &le->attribute->credential))
-        {
-          found_pres_cnt++;
-          ple = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-          ple->presentation = presentation;
-          GNUNET_CONTAINER_DLL_insert (ticket_presentations->list_head,
-                                       ticket_presentations->list_tail,
-                                       ple);
-        }
-      }
-    }
-  }
-
-  /**
-   * If we found a matching ticket, return that to the caller and
-   * we are done.
-   */
-  if ((attr_cnt == found_attrs_cnt) &&
-      (pres_cnt == found_pres_cnt) &&
-      (GNUNET_YES == ticket_found))
-  {
-    GNUNET_NAMESTORE_zone_iteration_stop (tih->ns_it);
-    tih->cb (tih->cb_cls, &tih->ticket, ticket_presentations, GNUNET_OK, NULL);
-    GNUNET_RECLAIM_presentation_list_destroy (ticket_presentations);
-    cleanup_issue_handle (tih);
-    return;
-  }
-  GNUNET_RECLAIM_presentation_list_destroy (ticket_presentations);
-  // ticket not found in current record, checking next record set
-  GNUNET_NAMESTORE_zone_iterator_next (tih->ns_it, 1);
-}
-
-
-/**
- * Done iterating over tickets and we apparently did
- * not find an existing, matching ticket.
- * Continue by issuing a new ticket.
- *
- * @param cls handle to the operation
- */
-static void
-filter_tickets_finished_cb (void *cls)
-{
-  struct TicketIssueHandle *tih = cls;
-
-  GNUNET_CRYPTO_key_get_public (&tih->identity, &tih->ticket.identity);
-  GNUNET_RECLAIM_id_generate (&tih->ticket.rnd);
-  issue_ticket (tih);
-}
-
-
-/**
- * Issue a new reclaim ticket, thereby authorizing
- * the audience to access the set of provided attributes.
- *
- * @param identity the issuer
- * @param attrs the attributes to share
- * @param audience the audience to share the attributes with
- * @param cb the callback to call with the ticket result
- * @param cb_cls the callback closure
- * FIXME: Return handle??
- */
-void
-RECLAIM_TICKETS_issue (const struct GNUNET_CRYPTO_PrivateKey *identity,
-                       const struct GNUNET_RECLAIM_AttributeList *attrs,
-                       const struct GNUNET_CRYPTO_PublicKey *audience,
-                       RECLAIM_TICKETS_TicketResult cb,
-                       void *cb_cls)
-{
-  struct TicketIssueHandle *tih;
-
-  tih = GNUNET_new (struct TicketIssueHandle);
-  tih->cb = cb;
-  tih->cb_cls = cb_cls;
-  tih->attrs = GNUNET_RECLAIM_attribute_list_dup (attrs);
-  tih->presentations = GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
-  tih->identity = *identity;
-  tih->ticket.audience = *audience;
-
-  // First check whether the ticket has already been issued
-  tih->ns_it =
-    GNUNET_NAMESTORE_zone_iteration_start (nsh,
-                                           &tih->identity,
-                                           &filter_tickets_error_cb,
-                                           tih,
-                                           &filter_tickets_cb,
-                                           tih,
-                                           &filter_tickets_finished_cb,
-                                           tih);
-}
-
-
-/************************************
- * Ticket iteration
- ************************************/
-
-/**
- * Cleanup ticket iterator
- *
- * @param iter handle to the iteration
- */
-static void
-cleanup_iter (struct RECLAIM_TICKETS_Iterator *iter)
-{
-  if (NULL != iter->ns_it)
-    GNUNET_NAMESTORE_zone_iteration_stop (iter->ns_it);
-  GNUNET_free (iter);
-}
-
-
-/**
- * Return each record of type #GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET
- * to the caller and proceed with the iteration.
- * FIXME: Should we _not_ proceed automatically here?
- *
- * @param cls handle to the iteration
- * @param zone the ticket issuer
- * @param label the ticket rnd
- * @param rd_count number of records in record set
- * @param rd record set containing a ticket
- */
-static void
-collect_tickets_cb (void *cls,
-                    const struct GNUNET_CRYPTO_PrivateKey *zone,
-                    const char *label,
-                    unsigned int rd_count,
-                    const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct RECLAIM_TICKETS_Iterator *iter = cls;
-  struct GNUNET_RECLAIM_Ticket ticket;
-  size_t read;
-
-  for (int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET != rd[i].record_type)
-      continue;
-    if ((GNUNET_SYSERR ==
-         GNUNET_RECLAIM_read_ticket_from_buffer (rd[i].data,
-                                                 rd[i].data_size,
-                                                 &ticket,
-                                                 &read)) ||
-        (read != rd[i].data_size))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to deserialize ticket from record\n");
-      continue;
-    }
-    iter->cb (iter->cb_cls, &ticket);
-    return;
-  }
-  GNUNET_NAMESTORE_zone_iterator_next (iter->ns_it, 1);
-}
-
-
-/**
- * Signal ticket iteration has finished
- *
- * @param cls handle to the iteration
- */
-static void
-collect_tickets_finished_cb (void *cls)
-{
-  struct RECLAIM_TICKETS_Iterator *iter = cls;
-
-  iter->ns_it = NULL;
-  iter->cb (iter->cb_cls, NULL);
-  cleanup_iter (iter);
-}
-
-
-/**
- * Cancel ticket iteration on namestore error
- *
- * @param cls the iteration handle
- */
-static void
-collect_tickets_error_cb (void *cls)
-{
-  struct RECLAIM_TICKETS_Iterator *iter = cls;
-
-  iter->ns_it = NULL;
-  iter->cb (iter->cb_cls, NULL);
-  cleanup_iter (iter);
-}
-
-
-/**
- * Continue ticket iteration
- *
- * @param iter the iteration to continue
- */
-void
-RECLAIM_TICKETS_iteration_next (struct RECLAIM_TICKETS_Iterator *iter)
-{
-  GNUNET_NAMESTORE_zone_iterator_next (iter->ns_it, 1);
-}
-
-
-/**
- * Stop a running ticket iteration
- *
- * @param iter iteration to cancel
- */
-void
-RECLAIM_TICKETS_iteration_stop (struct RECLAIM_TICKETS_Iterator *iter)
-{
-  GNUNET_NAMESTORE_zone_iteration_stop (iter->ns_it);
-  cleanup_iter (iter);
-}
-
-
-/**
- * Iterate over all tickets issued by an identity
- *
- * @param identity the issuing identity
- * @param cb ticket callback function
- * @param cb_cls callback closure
- * @return a handle to the iteration
- */
-struct RECLAIM_TICKETS_Iterator *
-RECLAIM_TICKETS_iteration_start (
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  RECLAIM_TICKETS_TicketIter cb,
-  void *cb_cls)
-{
-  struct RECLAIM_TICKETS_Iterator *iter;
-
-  iter = GNUNET_new (struct RECLAIM_TICKETS_Iterator);
-  iter->cb = cb;
-  iter->cb_cls = cb_cls;
-  iter->ns_it =
-    GNUNET_NAMESTORE_zone_iteration_start (nsh,
-                                           identity,
-                                           &collect_tickets_error_cb,
-                                           iter,
-                                           &collect_tickets_cb,
-                                           iter,
-                                           &collect_tickets_finished_cb,
-                                           iter);
-  return iter;
-}
-
-
-/**
- * Initialize tickets component
- *
- * @param c the configuration
- * @return GNUNET_SYSERR on error
- */
-int
-RECLAIM_TICKETS_init (const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  // Get ticket expiration time (relative) from config
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_time (c,
-                                           "reclaim",
-                                           "TICKET_REFRESH_INTERVAL",
-                                           &ticket_refresh_interval))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Configured refresh interval for tickets: %s\n",
-                GNUNET_STRINGS_relative_time_to_string (ticket_refresh_interval,
-                                                        GNUNET_YES));
-  }
-  else
-  {
-    ticket_refresh_interval = DEFAULT_TICKET_REFRESH_INTERVAL;
-  }
-  // Connect to identity and namestore services
-  nsh = GNUNET_NAMESTORE_connect (c);
-  if (NULL == nsh)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                         "error connecting to namestore");
-    return GNUNET_SYSERR;
-  }
-  gns = GNUNET_GNS_connect (c);
-  if (NULL == gns)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "error connecting to gns");
-    return GNUNET_SYSERR;
-  }
-  stats = GNUNET_STATISTICS_create ("reclaim", c);
-  return GNUNET_OK;
-}
-
-
-/**
- * Close handles and clean up.
- * FIXME: cancel all pending operations (gns, ns etc)
- */
-void
-RECLAIM_TICKETS_deinit (void)
-{
-  if (NULL != nsh)
-    GNUNET_NAMESTORE_disconnect (nsh);
-  nsh = NULL;
-  if (NULL != gns)
-    GNUNET_GNS_disconnect (gns);
-  gns = NULL;
-  if (NULL != stats)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-    stats = NULL;
-  }
-}
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.h b/src/reclaim/gnunet-service-reclaim_tickets.h
deleted file mode 100644
index 0ec232f49..000000000
--- a/src/reclaim/gnunet-service-reclaim_tickets.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author Martin Schanzenbach
- * @file src/reclaim/gnunet-service-reclaim_tickets.h
- * @brief reclaim tickets
- *
- */
-
-#ifndef GNUNET_SERVICE_RECLAIM_TICKETS_H
-#define GNUNET_SERVICE_RECLAIM_TICKETS_H
-
-#include "platform.h"
-
-#include "gnunet_util_lib.h"
-
-#include "gnunet_constants.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_signatures.h"
-#include "gnunet_statistics_service.h"
-#include "reclaim.h"
-
-/**
- * Ticket iterator
- */
-struct RECLAIM_TICKETS_Iterator;
-
-
-/**
- * Handle to a consume operation
- */
-struct RECLAIM_TICKETS_ConsumeHandle;
-
-
-/**
- * Ticket revocation request handle
- */
-struct RECLAIM_TICKETS_RevokeHandle;
-
-
-/**
- * List of tickets
- */
-struct TicketRecordsEntry
-{
-  /**
-   * DLL
-   */
-  struct TicketRecordsEntry *next;
-
-  /**
-   * DLL
-   */
-  struct TicketRecordsEntry *prev;
-
-  /**
-   * Record count
-   */
-  unsigned int rd_count;
-
-  /**
-   * Data
-   */
-  char *data;
-
-  /**
-   * Data size
-   */
-  size_t data_size;
-
-  /**
-   * Label
-   */
-  char *label;
-};
-
-
-/**
- * Continuation called with ticket.
- *
- * @param cls closure
- * @param ticket the ticket
- */
-typedef void (*RECLAIM_TICKETS_TicketIter) (
-  void *cls,
-  struct GNUNET_RECLAIM_Ticket *ticket);
-
-
-/**
- * Continuation called with ticket.
- *
- * @param cls closure
- * @param ticket the ticket
- * @param presentations new presentations for ticket (NULL on error)
- * @param success #GNUNET_SYSERR on failure (including timeout/queue
- * drop/failure to validate) #GNUNET_OK on success
- * @param emsg NULL on success, otherwise an error message
- */
-typedef void (*RECLAIM_TICKETS_TicketResult) (
-  void *cls,
-  struct GNUNET_RECLAIM_Ticket *ticket,
-  struct GNUNET_RECLAIM_PresentationList *presentations,
-  int32_t success,
-  const char *emsg);
-
-
-/**
- * Consume callback.
- *
- * @param cls closure
- * @param identity the issuer of the ticket/attributes
- * @param attributes attribute list retrieved through ticket
- * @param presentations attribute presentations (may be NULL)
- * @param success GNUNET_OK on success
- * @param emsg error message (NULL on success)
- */
-typedef void (*RECLAIM_TICKETS_ConsumeCallback) (
-  void *cls,
-  const struct GNUNET_CRYPTO_PublicKey *identity,
-  const struct GNUNET_RECLAIM_AttributeList *attributes,
-  const struct GNUNET_RECLAIM_PresentationList *presentations,
-  int32_t success,
-  const char *emsg);
-
-
-/**
- * Revocation callback.
- *
- * @param cls closure
- * @param success GNUNET_OK on success
- */
-typedef void (*RECLAIM_TICKETS_RevokeCallback) (void *cls, int32_t success);
-
-
-/**
- * Revoke a ticket.
- * We start by looking up attribute references in order
- * to change attribute IDs.
- *
- * @param ticket ticket to revoke
- * @param identity private key of issuer
- * @param cb revocation status callback
- * @param cb_cls callback closure
- * @return handle to the operation
- */
-struct RECLAIM_TICKETS_RevokeHandle *
-RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket,
-                        const struct GNUNET_CRYPTO_PrivateKey *identity,
-                        RECLAIM_TICKETS_RevokeCallback cb,
-                        void *cb_cls);
-
-
-/**
- * Cancel a revocation.
- *
- * @param rh handle to the operation
- */
-void
-RECLAIM_TICKETS_revoke_cancel (struct RECLAIM_TICKETS_RevokeHandle *rh);
-
-
-/**
- * Consume a ticket.
- * We first looking attribute references under the label
- * ticket.rnd in GNS.
- *
- * @param id the audience of the ticket
- * @param ticket the ticket to consume
- * @param cb callback to call with attributes of ticket
- * @param cb_cls callback closure
- * @return handle to the operation
- */
-struct RECLAIM_TICKETS_ConsumeHandle *
-RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_PrivateKey *id,
-                         const struct GNUNET_RECLAIM_Ticket *ticket,
-                         RECLAIM_TICKETS_ConsumeCallback cb,
-                         void *cb_cls);
-
-
-/**
- * Cancel a consume operation
- *
- * @param cth the operation to cancel
- */
-void
-RECLAIM_TICKETS_consume_cancel (struct RECLAIM_TICKETS_ConsumeHandle *cth);
-
-
-/**
- * Issue a new reclaim ticket, thereby authorizing
- * the audience to access the set of provided attributes.
- *
- * @param identity the issuer
- * @param attrs the attributes to share
- * @param audience the audience to share the attributes with
- * @param cb the callback to call with the ticket result
- * @param cb_cls the callback closure
- * FIXME: Return handle??
- */
-void
-RECLAIM_TICKETS_issue (const struct GNUNET_CRYPTO_PrivateKey *identity,
-                       const struct GNUNET_RECLAIM_AttributeList *attrs,
-                       const struct GNUNET_CRYPTO_PublicKey *audience,
-                       RECLAIM_TICKETS_TicketResult cb,
-                       void *cb_cls);
-
-
-/**
- * Continue ticket iteration
- *
- * @param iter the iteration to continue
- */
-void
-RECLAIM_TICKETS_iteration_next (struct RECLAIM_TICKETS_Iterator *iter);
-
-
-/**
- * Stop a running ticket iteration
- *
- * @param iter iteration to cancel
- */
-void
-RECLAIM_TICKETS_iteration_stop (struct RECLAIM_TICKETS_Iterator *iter);
-
-
-/**
- * Iterate over all tickets issued by an identity
- *
- * @param identity the issuing identity
- * @param cb ticket callback function
- * @param cb_cls callback closure
- * @return a handle to the iteration
- */
-struct RECLAIM_TICKETS_Iterator *
-RECLAIM_TICKETS_iteration_start (
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  RECLAIM_TICKETS_TicketIter cb,
-  void *cb_cls);
-
-
-/**
- * Initialize tickets component
- *
- * @param c the configuration
- * @return GNUNET_SYSERR on error
- */
-int
-RECLAIM_TICKETS_init (const struct GNUNET_CONFIGURATION_Handle *c);
-
-
-/**
- * Close handles and clean up.
- * FIXME: cancel all pending operations (gns, ns etc)
- */
-void
-RECLAIM_TICKETS_deinit (void);
-
-#endif
diff --git a/src/reclaim/json_reclaim.c b/src/reclaim/json_reclaim.c
deleted file mode 100644
index b1ca7a4a5..000000000
--- a/src/reclaim/json_reclaim.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2009-2018 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file rest-plugins/json_reclaim.c
- * @brief JSON handling of reclaim data
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_json_lib.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-
-
-/**
- * Parse given JSON object to a claim
- *
- * @param cls closure, NULL
- * @param root the json object representing data
- * @param spec where to write the data
- * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
- */
-static int
-parse_attr (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec)
-{
-  struct GNUNET_RECLAIM_Attribute *attr;
-  const char *name_str = NULL;
-  const char *val_str = NULL;
-  const char *type_str = NULL;
-  const char *id_str = NULL;
-  const char *cred_str = NULL;
-  const char *flag_str = NULL;
-  char *data;
-  int unpack_state;
-  uint32_t type;
-  size_t data_size;
-
-  GNUNET_assert (NULL != root);
-
-  if (! json_is_object (root))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error json is not array nor object!\n");
-    return GNUNET_SYSERR;
-  }
-  // interpret single attribute
-  unpack_state = json_unpack (root,
-                              "{s:s, s?s, s?s, s:s, s:s, s?s!}",
-                              "name",
-                              &name_str,
-                              "id",
-                              &id_str,
-                              "credential",
-                              &cred_str,
-                              "type",
-                              &type_str,
-                              "value",
-                              &val_str,
-                              "flag",
-                              &flag_str);
-  if ((0 != unpack_state) || (NULL == name_str) || (NULL == val_str) ||
-      (NULL == type_str))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error json object has a wrong format!\n");
-    return GNUNET_SYSERR;
-  }
-  type = GNUNET_RECLAIM_attribute_typename_to_number (type_str);
-  if (GNUNET_SYSERR ==
-      (GNUNET_RECLAIM_attribute_string_to_value (type,
-                                                 val_str,
-                                                 (void **) &data,
-                                                 &data_size)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Attribute value invalid!\n");
-    return GNUNET_SYSERR;
-  }
-  attr = GNUNET_RECLAIM_attribute_new (name_str, NULL,
-                                       type, data, data_size);
-  GNUNET_free (data);
-  if ((NULL != cred_str) && (0 != strlen (cred_str)))
-  {
-    GNUNET_STRINGS_string_to_data (cred_str,
-                                   strlen (cred_str),
-                                   &attr->credential,
-                                   sizeof(attr->credential));
-  }
-  if ((NULL == id_str) || (0 == strlen (id_str)))
-    memset (&attr->id, 0, sizeof (attr->id));
-  else
-    GNUNET_STRINGS_string_to_data (id_str,
-                                   strlen (id_str),
-                                   &attr->id,
-                                   sizeof(attr->id));
-
-  *(struct GNUNET_RECLAIM_Attribute **) spec->ptr = attr;
-  return GNUNET_OK;
-}
-
-
-/**
- * Cleanup data left from parsing RSA public key.
- *
- * @param cls closure, NULL
- * @param[out] spec where to free the data
- */
-static void
-clean_attr (void *cls, struct GNUNET_JSON_Specification *spec)
-{
-  struct GNUNET_RECLAIM_Attribute **attr;
-
-  attr = (struct GNUNET_RECLAIM_Attribute **) spec->ptr;
-  if (NULL != *attr)
-  {
-    GNUNET_free (*attr);
-    *attr = NULL;
-  }
-}
-
-
-/**
- * JSON Specification for Reclaim claims.
- *
- * @param ticket struct of GNUNET_RECLAIM_Attribute to fill
- * @return JSON Specification
- */
-struct GNUNET_JSON_Specification
-GNUNET_RECLAIM_JSON_spec_attribute (struct GNUNET_RECLAIM_Attribute **attr)
-{
-  struct GNUNET_JSON_Specification ret = { .parser = &parse_attr,
-                                           .cleaner = &clean_attr,
-                                           .cls = NULL,
-                                           .field = NULL,
-                                           .ptr = attr,
-                                           .ptr_size = 0,
-                                           .size_ptr = NULL };
-
-  *attr = NULL;
-  return ret;
-}
-
-
-/**
- * Parse given JSON object to a ticket
- *
- * @param cls closure, NULL
- * @param root the json object representing data
- * @param spec where to write the data
- * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
- */
-static int
-parse_ticket (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec)
-{
-  struct GNUNET_RECLAIM_Ticket *ticket;
-  const char *rnd_str;
-  const char *aud_str;
-  const char *id_str;
-  int unpack_state;
-
-  GNUNET_assert (NULL != root);
-
-  if (! json_is_object (root))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error json is not array nor object!\n");
-    return GNUNET_SYSERR;
-  }
-  // interpret single ticket
-  unpack_state = json_unpack (root,
-                              "{s:s, s:s, s:s!}",
-                              "rnd",
-                              &rnd_str,
-                              "audience",
-                              &aud_str,
-                              "issuer",
-                              &id_str);
-  if (0 != unpack_state)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Error json object has a wrong format!\n");
-    return GNUNET_SYSERR;
-  }
-  ticket = GNUNET_new (struct GNUNET_RECLAIM_Ticket);
-  if (GNUNET_OK != GNUNET_STRINGS_string_to_data (rnd_str,
-                                                  strlen (rnd_str),
-                                                  &ticket->rnd,
-                                                  sizeof(ticket->rnd)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Rnd invalid\n");
-    GNUNET_free (ticket);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (id_str,
-                                     strlen (id_str),
-                                     &ticket->identity,
-                                     sizeof(ticket->identity)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Identity invalid\n");
-    GNUNET_free (ticket);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (aud_str,
-                                     strlen (aud_str),
-                                     &ticket->audience,
-                                     sizeof(ticket->audience)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Audience invalid\n");
-    GNUNET_free (ticket);
-    return GNUNET_SYSERR;
-  }
-
-  *(struct GNUNET_RECLAIM_Ticket **) spec->ptr = ticket;
-  return GNUNET_OK;
-}
-
-
-/**
- * Cleanup data left from parsing RSA public key.
- *
- * @param cls closure, NULL
- * @param[out] spec where to free the data
- */
-static void
-clean_ticket (void *cls, struct GNUNET_JSON_Specification *spec)
-{
-  struct GNUNET_RECLAIM_Ticket **ticket;
-
-  ticket = (struct GNUNET_RECLAIM_Ticket **) spec->ptr;
-  if (NULL != *ticket)
-  {
-    GNUNET_free (*ticket);
-    *ticket = NULL;
-  }
-}
-
-
-/**
- * JSON Specification for Reclaim tickets.
- *
- * @param ticket struct of GNUNET_RECLAIM_Ticket to fill
- * @return JSON Specification
- */
-struct GNUNET_JSON_Specification
-GNUNET_RECLAIM_JSON_spec_ticket (struct GNUNET_RECLAIM_Ticket **ticket)
-{
-  struct GNUNET_JSON_Specification ret = { .parser = &parse_ticket,
-                                           .cleaner = &clean_ticket,
-                                           .cls = NULL,
-                                           .field = NULL,
-                                           .ptr = ticket,
-                                           .ptr_size = 0,
-                                           .size_ptr = NULL };
-
-  *ticket = NULL;
-  return ret;
-}
-
-
-/**
-   * Parse given JSON object to a credential claim
-   *
-   * @param cls closure, NULL
-   * @param root the json object representing data
-   * @param spec where to write the data
-   * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
-   */
-static int
-parse_credential (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec)
-{
-  struct GNUNET_RECLAIM_Credential *cred;
-  const char *name_str = NULL;
-  const char *type_str = NULL;
-  const char *id_str = NULL;
-  json_t *val_json;
-  char *data = NULL;
-  char *val_str = NULL;
-  int unpack_state;
-  uint32_t type;
-  size_t data_size;
-
-  GNUNET_assert (NULL != root);
-
-  if (! json_is_object (root))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error json is not array nor object!\n");
-    return GNUNET_SYSERR;
-  }
-  // interpret single attribute
-  unpack_state = json_unpack (root,
-                              "{s:s, s?s, s:s, s:o!}",
-                              "name",
-                              &name_str,
-                              "id",
-                              &id_str,
-                              "type",
-                              &type_str,
-                              "value",
-                              &val_json);
-  if ((0 != unpack_state) || (NULL == name_str) || (NULL == val_json) ||
-      (NULL == type_str))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error json object has a wrong format!\n");
-    return GNUNET_SYSERR;
-  }
-  if (json_is_string (val_json)) {
-    val_str = GNUNET_strdup (json_string_value (val_json));
-  } else {
-    val_str = json_dumps (val_json, JSON_COMPACT);
-  }
-  type = GNUNET_RECLAIM_credential_typename_to_number (type_str);
-  if (GNUNET_SYSERR ==
-      (GNUNET_RECLAIM_credential_string_to_value (type,
-                                                  val_str,
-                                                  (void **) &data,
-                                                  &data_size)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Credential value invalid!\n");
-    return GNUNET_SYSERR;
-  }
-  cred = GNUNET_RECLAIM_credential_new (name_str, type, data, data_size);
-  GNUNET_free (data);
-  if ((NULL == id_str) || (0 == strlen (id_str)))
-    memset (&cred->id, 0, sizeof (cred->id));
-  else
-    GNUNET_STRINGS_string_to_data (id_str,
-                                   strlen (id_str),
-                                   &cred->id,
-                                   sizeof(cred->id));
-
-  *(struct GNUNET_RECLAIM_Credential **) spec->ptr = cred;
-  return GNUNET_OK;
-}
-
-
-/**
- * Cleanup data left from parsing RSA public key.
- *
- * @param cls closure, NULL
- * @param[out] spec where to free the data
- */
-static void
-clean_credential (void *cls, struct GNUNET_JSON_Specification *spec)
-{
-  struct GNUNET_RECLAIM_Credential **attr;
-
-  attr = (struct GNUNET_RECLAIM_Credential **) spec->ptr;
-  if (NULL != *attr)
-  {
-    GNUNET_free (*attr);
-    *attr = NULL;
-  }
-}
-
-
-/**
- * JSON Specification for credential claims.
- *
- * @param attr struct of GNUNET_RECLAIM_Credential to fill
- * @return JSON Specification
- */
-struct GNUNET_JSON_Specification
-GNUNET_RECLAIM_JSON_spec_credential (struct
-                                     GNUNET_RECLAIM_Credential **cred)
-{
-  struct GNUNET_JSON_Specification ret = { .parser = &parse_credential,
-                                           .cleaner = &clean_credential,
-                                           .cls = NULL,
-                                           .field = NULL,
-                                           .ptr = cred,
-                                           .ptr_size = 0,
-                                           .size_ptr = NULL };
-
-  *cred = NULL;
-  return ret;
-}
diff --git a/src/reclaim/json_reclaim.h b/src/reclaim/json_reclaim.h
deleted file mode 100644
index 613ddf873..000000000
--- a/src/reclaim/json_reclaim.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2009-2018 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file rest-plugins/json_reclaim.h
- * @brief JSON handling of reclaim data
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_json_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_reclaim_lib.h"
-
-/**
- * JSON Specification for Reclaim claims.
- *
- * @param attr struct of GNUNET_RECLAIM_Attribute to fill
- * @return JSON Specification
- */
-struct GNUNET_JSON_Specification
-GNUNET_RECLAIM_JSON_spec_attribute (struct GNUNET_RECLAIM_Attribute **attr);
-
-/**
- * JSON Specification for Reclaim tickets.
- *
- * @param ticket struct of GNUNET_RECLAIM_Ticket to fill
- * @return JSON Specification
- */
-struct GNUNET_JSON_Specification
-GNUNET_RECLAIM_JSON_spec_ticket (struct GNUNET_RECLAIM_Ticket **ticket);
-
-/**
-    * JSON Specification for credentials.
-    *
-    * @param cred struct of GNUNET_RECLAIM_Credential to fill
-    * @return JSON Specification
-    */
-struct GNUNET_JSON_Specification
-GNUNET_RECLAIM_JSON_spec_credential (struct  GNUNET_RECLAIM_Credential **cred);
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
deleted file mode 100644
index fafc68a92..000000000
--- a/src/reclaim/meson.build
+++ /dev/null
@@ -1,144 +0,0 @@
-libgnunetreclaim_src = ['reclaim_api.c',
-                        'reclaim_attribute.c',
-                        'reclaim_credential.c']
-libgnunetdid_src = ['did_helper.c',
-                    'did_core.c']
-
-gnunetservicereclaim_src = ['gnunet-service-reclaim.c',
-                        'gnunet-service-reclaim_tickets.c']
-
-configure_file(input : 'reclaim.conf',
-               output : 'reclaim.conf',
-               configuration : cdata,
-               install: true,
-               install_dir: pkgcfgdir)
-
-
-if get_option('monolith')
-  foreach p : libgnunetreclaim_src + gnunetservicereclaim_src
-    gnunet_src += 'reclaim/' + p
-  endforeach
-  subdir_done()
-endif
-
-libgnunetreclaim = library('gnunetreclaim',
-        libgnunetreclaim_src,
-        soversion: '0',
-        version: '0.0.0',
-        dependencies: [libgnunetutil_dep,
-                       libgnunetidentity_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir'))
-libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
-pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org',
-             description : 'Provides API to access reclaimID')
-
-shared_module('gnunet_plugin_gnsrecord_reclaim',
-              ['plugin_gnsrecord_reclaim.c'],
-              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir')/'gnunet')
-
-libgnunetdid = library('gnunetdid',
-        libgnunetdid_src,
-        soversion: '0',
-        version: '0.0.0',
-        dependencies: [libgnunetutil_dep,
-                       libgnunetnamestore_dep,
-                       libgnunetgnsrecord_dep,
-                       libgnunetgns_dep,
-                       json_dep,
-                       libgnunetidentity_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir'))
-libgnunetdid_dep = declare_dependency(link_with : libgnunetdid)
-pkg.generate(libgnunetdid, url: 'https://www.gnunet.org',
-             description : 'Provides API to manipulate DID')
-
-shared_module('gnunet_plugin_rest_reclaim',
-              ['plugin_rest_reclaim.c', 'json_reclaim.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetreclaim_dep,
-                             libgnunetjson_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-shared_module('gnunet_plugin_reclaim_attribute_basic',
-              ['plugin_reclaim_attribute_basic.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetreclaim_dep,
-                             libgnunetjson_dep,
-                             libgnunetutil_dep,
-                             json_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-shared_module('gnunet_plugin_reclaim_credential_jwt',
-              ['plugin_reclaim_credential_jwt.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetreclaim_dep,
-                             libgnunetjson_dep,
-                             libgnunetutil_dep,
-                             json_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
-
-shared_module('gnunet_plugin_rest_openid_connect',
-              ['plugin_rest_openid_connect.c', 'oidc_helper.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetreclaim_dep,
-                             libgnunetidentity_dep,
-                             libgnunetgns_dep,
-                             libgnunetutil_dep,
-                             jose_dep,
-                             gcrypt_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
-
-executable ('gnunet-reclaim',
-            'gnunet-reclaim.c',
-            dependencies: [libgnunetreclaim_dep,
-                           libgnunetidentity_dep,
-                           libgnunetutil_dep],
-            include_directories: [incdir, configuration_inc],
-            install: true,
-            install_dir: get_option('bindir'))
-executable ('gnunet-did',
-            'gnunet-did.c',
-            dependencies: [libgnunetreclaim_dep,
-                           libgnunetdid_dep,
-                           libgnunetgns_dep,
-                           libgnunetnamestore_dep,
-                           libgnunetidentity_dep,
-                           libgnunetutil_dep],
-            include_directories: [incdir, configuration_inc],
-            install: true,
-            install_dir: get_option('bindir'))
-executable ('gnunet-service-reclaim',
-            gnunetservicereclaim_src,
-            dependencies: [libgnunetreclaim_dep,
-                           libgnunetutil_dep,
-                           libgnunetstatistics_dep,
-                           libgnunetgnsrecord_dep,
-                           libgnunetgns_dep,
-                           libgnunetidentity_dep,
-                           libgnunetnamestore_dep],
-            include_directories: [incdir, configuration_inc],
-            install: true,
-            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
deleted file mode 100644
index a2da7312b..000000000
--- a/src/reclaim/oidc_helper.c
+++ /dev/null
@@ -1,1026 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/oidc_helper.c
- * @brief helper library for OIDC related functions
- * @author Martin Schanzenbach
- * @author Tristan Schwieren
- */
-#include "platform.h"
-#include <inttypes.h>
-#include <jansson.h>
-#include <jose/jose.h>
-#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_signatures.h"
-#include "oidc_helper.h"
-// #include "benchmark.h"
-#include <gcrypt.h>
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * The signature used to generate the authorization code
- */
-struct OIDC_Parameters
-{
-  /**
-   * The reclaim ticket
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-
-  /**
-   * The nonce length
-   */
-  uint32_t nonce_len GNUNET_PACKED;
-
-  /**
-   * The length of the PKCE code_challenge
-   */
-  uint32_t code_challenge_len GNUNET_PACKED;
-
-  /**
-   * The length of the attributes list
-   */
-  uint32_t attr_list_len GNUNET_PACKED;
-
-  /**
-   * The length of the presentation list
-   */
-  uint32_t pres_list_len GNUNET_PACKED;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Standard claims represented by the "profile" scope in OIDC
- */
-static char OIDC_profile_claims[14][32] = {
-  "name", "family_name", "given_name", "middle_name", "nickname",
-  "preferred_username", "profile", "picture", "website", "gender", "birthdate",
-  "zoneinfo", "locale", "updated_at"
-};
-
-/**
- * Standard claims represented by the "email" scope in OIDC
- */
-static char OIDC_email_claims[2][16] = {
-  "email", "email_verified"
-};
-
-/**
- * Standard claims represented by the "phone" scope in OIDC
- */
-static char OIDC_phone_claims[2][32] = {
-  "phone_number", "phone_number_verified"
-};
-
-/**
- * Standard claims represented by the "address" scope in OIDC
- */
-static char OIDC_address_claims[5][32] = {
-  "street_address", "locality", "region", "postal_code", "country"
-};
-
-static enum GNUNET_GenericReturnValue
-is_claim_in_address_scope (const char *claim)
-{
-  int i;
-  for (i = 0; i < 5; i++)
-  {
-    if (0 == strcmp (claim, OIDC_address_claims[i]))
-    {
-      return GNUNET_YES;
-    }
-  }
-  return GNUNET_NO;
-}
-
-
-static char *
-create_jwt_hmac_header (void)
-{
-  json_t *root;
-  char *json_str;
-
-  root = json_object ();
-  json_object_set_new (root, JWT_ALG, json_string (JWT_ALG_VALUE_HMAC));
-  json_object_set_new (root, JWT_TYP, json_string (JWT_TYP_VALUE));
-
-  json_str = json_dumps (root, JSON_INDENT (0) | JSON_COMPACT);
-  json_decref (root);
-  return json_str;
-}
-
-
-static void
-replace_char (char *str, char find, char replace)
-{
-  char *current_pos = strchr (str, find);
-
-  while (current_pos)
-  {
-    *current_pos = replace;
-    current_pos = strchr (current_pos, find);
-  }
-}
-
-
-// RFC4648
-static void
-fix_base64 (char *str)
-{
-  // Replace + with -
-  replace_char (str, '+', '-');
-
-  // Replace / with _
-  replace_char (str, '/', '_');
-}
-
-
-static json_t*
-generate_userinfo_json (const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                        const struct GNUNET_RECLAIM_AttributeList *attrs,
-                        const struct
-                        GNUNET_RECLAIM_PresentationList *presentations)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  struct GNUNET_RECLAIM_PresentationListEntry *ple;
-  char *subject;
-  char *source_name;
-  char *attr_val_str;
-  char *pres_val_str;
-  json_t *body;
-  json_t *aggr_names;
-  json_t *aggr_sources;
-  json_t *aggr_sources_jwt;
-  json_t *addr_claim = NULL;
-  int num_presentations = 0;
-  for (le = attrs->list_head; NULL != le; le = le->next)
-  {
-    if (GNUNET_NO == GNUNET_RECLAIM_id_is_zero (&le->attribute->credential))
-      num_presentations++;
-  }
-
-  subject =
-    GNUNET_STRINGS_data_to_string_alloc (sub_key,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  body = json_object ();
-  aggr_names = json_object ();
-  aggr_sources = json_object ();
-
-  // iss REQUIRED case sensitive server uri with https
-  // The issuer is the local reclaim instance (e.g.
-  // https://reclaim.id/api/openid)
-  json_object_set_new (body, "iss", json_string (SERVER_ADDRESS));
-  // sub REQUIRED public key identity, not exceed 255 ASCII  length
-  json_object_set_new (body, "sub", json_string (subject));
-  GNUNET_free (subject);
-  pres_val_str = NULL;
-  source_name = NULL;
-  int i = 0;
-  for (ple = presentations->list_head; NULL != ple; ple = ple->next)
-  {
-    // New presentation
-    GNUNET_asprintf (&source_name,
-                     "src%d",
-                     i);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Adding new presentation source #%d\n", i);
-    aggr_sources_jwt = json_object ();
-    pres_val_str =
-      GNUNET_RECLAIM_presentation_value_to_string (ple->presentation->type,
-                                                   ple->presentation->data,
-                                                   ple->presentation->data_size);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Presentation is: %s\n", pres_val_str);
-    json_object_set_new (aggr_sources_jwt,
-                         GNUNET_RECLAIM_presentation_number_to_typename (
-                           ple->presentation->type),
-                         json_string (pres_val_str) );
-    json_object_set_new (aggr_sources, source_name, aggr_sources_jwt);
-    GNUNET_free (pres_val_str);
-    GNUNET_free (source_name);
-    source_name = NULL;
-    i++;
-  }
-
-  int addr_is_aggregated = GNUNET_NO;
-  int addr_is_normal = GNUNET_NO;
-  for (le = attrs->list_head; NULL != le; le = le->next)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Processing %s for userinfo body\n",
-                le->attribute->name);
-    if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&le->attribute->credential))
-    {
-      attr_val_str =
-        GNUNET_RECLAIM_attribute_value_to_string (le->attribute->type,
-                                                  le->attribute->data,
-                                                  le->attribute->data_size);
-      /**
-       * There is this weird quirk that the individual address claim(s) must be
-       * inside a JSON object of the "address" claim.
-       */
-      if (GNUNET_YES == is_claim_in_address_scope (le->attribute->name))
-      {
-        if (GNUNET_YES == addr_is_aggregated)
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                      "Address is set as aggregated claim. Skipping self-issued value...\n");
-          GNUNET_free (attr_val_str);
-          continue;
-        }
-        addr_is_normal = GNUNET_YES;
-
-        if (NULL == addr_claim)
-        {
-          addr_claim = json_object ();
-          json_object_set_new (body, "address", addr_claim);
-        }
-        json_object_set_new (addr_claim, le->attribute->name,
-                             json_string (attr_val_str));
-
-      }
-      else
-      {
-        json_object_set_new (body, le->attribute->name,
-                             json_string (attr_val_str));
-      }
-      GNUNET_free (attr_val_str);
-    }
-    else
-    {
-      // Check if presentation is there
-      int j = 0;
-      for (ple = presentations->list_head; NULL != ple; ple = ple->next)
-      {
-        if (GNUNET_YES ==
-            GNUNET_RECLAIM_id_is_equal (&ple->presentation->credential_id,
-                                        &le->attribute->credential))
-          break;
-        j++;
-      }
-      if (NULL == ple)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Presentation for `%s' missing...\n",
-                    le->attribute->name);
-        continue;
-      }
-      /**
-       * There is this weird quirk that the individual address claim(s) must be
-       * inside a JSON object of the "address" claim.
-       */
-      if (GNUNET_YES == is_claim_in_address_scope (le->attribute->name))
-      {
-        if (GNUNET_YES == addr_is_normal)
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                      "Address is already set as normal claim. Skipping attested value...\n");
-          continue;
-        }
-        addr_is_aggregated = GNUNET_YES;
-        /** This is/can only be set once! **/
-        if (NULL != addr_claim)
-          continue;
-        addr_claim = json_object ();
-        GNUNET_asprintf (&source_name,
-                         "src%d",
-                         j);
-        json_object_set_new (aggr_names, "address",
-                             json_string (source_name));
-        GNUNET_free (source_name);
-      }
-      else
-      {
-        // Presentation exists, hence take the respective source str
-        GNUNET_asprintf (&source_name,
-                         "src%d",
-                         j);
-        json_object_set_new (aggr_names, le->attribute->name,
-                             json_string (source_name));
-        GNUNET_free (source_name);
-      }
-    }
-  }
-  if (0 != i)
-  {
-    json_object_set_new (body, "_claim_names", aggr_names);
-    json_object_set_new (body, "_claim_sources", aggr_sources);
-  }
-
-  return body;
-}
-
-
-/**
- * Generate userinfo JSON as string
- *
- * @param sub_key the subject (user)
- * @param attrs user attribute list
- * @param presentations credential presentation list (may be empty)
- * @return Userinfo JSON
- */
-char *
-OIDC_generate_userinfo (const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                        const struct GNUNET_RECLAIM_AttributeList *attrs,
-                        const struct
-                        GNUNET_RECLAIM_PresentationList *presentations)
-{
-  char *body_str;
-  json_t*body = generate_userinfo_json (sub_key,
-                                        attrs,
-                                        presentations);
-  body_str = json_dumps (body, JSON_INDENT (0) | JSON_COMPACT);
-  json_decref (body);
-  return body_str;
-}
-
-
-char *
-generate_id_token_body (const struct GNUNET_CRYPTO_PublicKey *aud_key,
-                        const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                        const struct GNUNET_RECLAIM_AttributeList *attrs,
-                        const struct
-                        GNUNET_RECLAIM_PresentationList *presentations,
-                        const struct GNUNET_TIME_Relative *expiration_time,
-                        const char *nonce)
-{
-  struct GNUNET_TIME_Absolute exp_time;
-  struct GNUNET_TIME_Absolute time_now;
-  json_t *body;
-  char *audience;
-  char *subject;
-  char *body_str;
-
-  body = generate_userinfo_json (sub_key,
-                                 attrs,
-                                 presentations);
-  // iat REQUIRED time now
-  time_now = GNUNET_TIME_absolute_get ();
-  // exp REQUIRED time expired from config
-  exp_time = GNUNET_TIME_absolute_add (time_now, *expiration_time);
-  // auth_time only if max_age
-  // nonce only if nonce
-  // OPTIONAL acr,amr,azp
-  subject =
-    GNUNET_STRINGS_data_to_string_alloc (sub_key,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  audience =
-    GNUNET_STRINGS_data_to_string_alloc (aud_key,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-
-  // aud REQUIRED public key client_id must be there
-  json_object_set_new (body, "aud", json_string (audience));
-  // iat
-  json_object_set_new (body,
-                       "iat",
-                       json_integer (time_now.abs_value_us / (1000 * 1000)));
-  // exp
-  json_object_set_new (body,
-                       "exp",
-                       json_integer (exp_time.abs_value_us / (1000 * 1000)));
-  // nbf
-  json_object_set_new (body,
-                       "nbf",
-                       json_integer (time_now.abs_value_us / (1000 * 1000)));
-  // nonce
-  if (NULL != nonce)
-    json_object_set_new (body, "nonce", json_string (nonce));
-
-  // Error checking
-  body_str = json_dumps (body, JSON_INDENT (2) | JSON_COMPACT);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"ID-Token: %s\n", body_str);
-
-  json_decref (body);
-  GNUNET_free (subject);
-  GNUNET_free (audience);
-
-  return body_str;
-}
-
-
-char *
-OIDC_generate_id_token_rsa (const struct GNUNET_CRYPTO_PublicKey *aud_key,
-                            const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                            const struct GNUNET_RECLAIM_AttributeList *attrs,
-                            const struct
-                            GNUNET_RECLAIM_PresentationList *presentations,
-                            const struct GNUNET_TIME_Relative *expiration_time,
-                            const char *nonce,
-                            const json_t *secret_rsa_key)
-{
-  json_t *jws;
-  char *body_str;
-  char *result;
-
-  // Generate the body of the JSON Web Signature
-  body_str = generate_id_token_body (aud_key,
-                                     sub_key,
-                                     attrs,
-                                     presentations,
-                                     expiration_time,
-                                     nonce);
-
-  if (NULL == body_str)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Body for the JWS could not be generated\n");
-    return NULL;
-  }
-
-  // Creating the JSON Web Signature.
-  jws = json_pack ("{s:o}", "payload",
-                   jose_b64_enc (body_str, strlen (body_str)));
-  GNUNET_free (body_str);
-
-  if (! jose_jws_sig (NULL, jws, NULL, secret_rsa_key))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Signature generation failed\n");
-    return NULL;
-  }
-
-  // Encoding JSON as compact JSON Web Signature
-  GNUNET_asprintf (&result, "%s.%s.%s",
-                   json_string_value (json_object_get (jws, "protected")),
-                   json_string_value (json_object_get (jws, "payload")),
-                   json_string_value (json_object_get (jws, "signature")) );
-
-  json_decref (jws);
-  return result;
-}
-
-/**
- * Create a JWT using HMAC (HS256) from attributes
- *
- * @param aud_key the public of the audience
- * @param sub_key the public key of the subject
- * @param attrs the attribute list
- * @param presentations credential presentation list (may be empty)
- * @param expiration_time the validity of the token
- * @param secret_key the key used to sign the JWT
- * @return a new base64-encoded JWT string.
- */
-char *
-OIDC_generate_id_token_hmac (const struct GNUNET_CRYPTO_PublicKey *aud_key,
-                             const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                             const struct GNUNET_RECLAIM_AttributeList *attrs,
-                             const struct
-                             GNUNET_RECLAIM_PresentationList *presentations,
-                             const struct GNUNET_TIME_Relative *expiration_time,
-                             const char *nonce,
-                             const char *secret_key)
-{
-  struct GNUNET_HashCode signature;
-  char *header;
-  char *header_base64;
-  char *body_str;
-  char *body_base64;
-  char *signature_target;
-  char *signature_base64;
-  char *result;
-
-  // Generate and encode Header
-  header = create_jwt_hmac_header ();
-  if (NULL == header)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Header for the JWS could not be generated\n");
-    return NULL;
-  }
-  GNUNET_STRINGS_base64url_encode (header, strlen (header), &header_base64);
-  GNUNET_free (header);
-  fix_base64 (header_base64);
-
-  // Generate and encode the body of the JSON Web Signature
-  body_str = generate_id_token_body (aud_key,
-                                     sub_key,
-                                     attrs,
-                                     presentations,
-                                     expiration_time,
-                                     nonce);
-
-  if (NULL == body_str)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Body for the JWS could not be generated\n");
-    GNUNET_free (header_base64);
-    return NULL;
-  }
-
-  GNUNET_STRINGS_base64url_encode (body_str, strlen (body_str), &body_base64);
-  fix_base64 (body_base64);
-
-  /**
-   * Creating the JWT signature. This might not be
-   * standards compliant, check.
-   */
-  GNUNET_asprintf (&signature_target, "%s.%s", header_base64, body_base64);
-  GNUNET_CRYPTO_hmac_raw (secret_key,
-                          strlen (secret_key),
-                          signature_target,
-                          strlen (signature_target),
-                          &signature);
-  GNUNET_STRINGS_base64url_encode ((const char *) &signature,
-                                   sizeof(struct GNUNET_HashCode),
-                                   &signature_base64);
-  fix_base64 (signature_base64);
-
-  GNUNET_asprintf (&result,
-                   "%s.%s.%s",
-                   header_base64,
-                   body_base64,
-                   signature_base64);
-
-  GNUNET_free (header_base64);
-  GNUNET_free (body_str);
-  GNUNET_free (body_base64);
-  GNUNET_free (signature_target);
-  GNUNET_free (signature_base64);
-  return result;
-}
-
-
-/**
- * Builds an OIDC authorization code including
- * a reclaim ticket and nonce
- *
- * @param issuer the issuer of the ticket, used to sign the ticket and nonce
- * @param ticket the ticket to include in the code
- * @param attrs list of attributes which are shared
- * @param presentations credential presentation list (may be empty)
- * @param nonce the nonce to include in the code
- * @param code_challenge PKCE code challenge
- * @return a new authorization code (caller must free)
- */
-char *
-OIDC_build_authz_code (const struct GNUNET_CRYPTO_PrivateKey *issuer,
-                       const struct GNUNET_RECLAIM_Ticket *ticket,
-                       const struct GNUNET_RECLAIM_AttributeList *attrs,
-                       const struct
-                       GNUNET_RECLAIM_PresentationList *presentations,
-                       const char *nonce_str,
-                       const char *code_challenge)
-{
-  struct OIDC_Parameters params;
-  char *code_payload;
-  char *payload;
-  char *tmp;
-  char *code_str;
-  char *buf_ptr = NULL;
-  size_t payload_len;
-  size_t code_payload_len;
-  size_t attr_list_len = 0;
-  size_t pres_list_len = 0;
-  size_t code_challenge_len = 0;
-  uint32_t nonce_len = 0;
-  struct GNUNET_CRYPTO_EccSignaturePurpose *purpose;
-
-  /** PLAINTEXT **/
-  // Assign ticket
-  memset (&params, 0, sizeof(params));
-  params.ticket = *ticket;
-  // Assign nonce
-  payload_len = sizeof(struct OIDC_Parameters);
-  if ((NULL != nonce_str) && (strcmp ("", nonce_str) != 0))
-  {
-    nonce_len = strlen (nonce_str);
-    payload_len += nonce_len;
-  }
-  params.nonce_len = htonl (nonce_len);
-  // Assign code challenge
-  if (NULL != code_challenge)
-    code_challenge_len = strlen (code_challenge);
-  payload_len += code_challenge_len;
-  params.code_challenge_len = htonl (code_challenge_len);
-  // Assign attributes
-  if (NULL != attrs)
-  {
-    // Get length
-    attr_list_len = GNUNET_RECLAIM_attribute_list_serialize_get_size (attrs);
-    params.attr_list_len = htonl (attr_list_len);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Length of serialized attributes: %lu\n",
-                attr_list_len);
-    // Get serialized attributes
-    payload_len += attr_list_len;
-  }
-  if (NULL != presentations)
-  {
-    // Get length
-    // FIXME only add presentations relevant for attribute list!!!
-    // This is important because of the distinction between id_token and
-    // userinfo in OIDC
-    pres_list_len =
-      GNUNET_RECLAIM_presentation_list_serialize_get_size (presentations);
-    params.pres_list_len = htonl (pres_list_len);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Length of serialized presentations: %lu\n",
-                pres_list_len);
-    // Get serialized attributes
-    payload_len += pres_list_len;
-  }
-
-  // Get plaintext length
-  payload = GNUNET_malloc (payload_len);
-  memcpy (payload, &params, sizeof(params));
-  tmp = payload + sizeof(params);
-  if (0 < code_challenge_len)
-  {
-    memcpy (tmp, code_challenge, code_challenge_len);
-    tmp += code_challenge_len;
-  }
-  if (0 < nonce_len)
-  {
-    memcpy (tmp, nonce_str, nonce_len);
-    tmp += nonce_len;
-  }
-  if (0 < attr_list_len)
-    GNUNET_RECLAIM_attribute_list_serialize (attrs, tmp);
-  tmp += attr_list_len;
-  if (0 < pres_list_len)
-    GNUNET_RECLAIM_presentation_list_serialize (presentations, tmp);
-  tmp += pres_list_len;
-
-  /** END **/
-
-  // Get length
-  code_payload_len = sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-                     + payload_len + sizeof(struct
-                                            GNUNET_CRYPTO_Signature);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Length of data to encode: %lu\n",
-              code_payload_len);
-
-  // Initialize code payload
-  code_payload = GNUNET_malloc (code_payload_len);
-  GNUNET_assert (NULL != code_payload);
-  purpose = (struct GNUNET_CRYPTO_EccSignaturePurpose *) code_payload;
-  purpose->size = htonl (sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-                         + payload_len);
-  purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_RECLAIM_CODE_SIGN);
-  // Store pubkey
-  buf_ptr = (char *) &purpose[1];
-  memcpy (buf_ptr, payload, payload_len);
-  GNUNET_free (payload);
-  buf_ptr += payload_len;
-  // Sign and store signature
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_sign_ (issuer,
-                             purpose,
-                             (struct GNUNET_CRYPTO_Signature *)
-                             buf_ptr))
-  {
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unable to sign code\n");
-    GNUNET_free (code_payload);
-    return NULL;
-  }
-  GNUNET_STRINGS_base64url_encode (code_payload, code_payload_len, &code_str);
-  GNUNET_free (code_payload);
-  return code_str;
-}
-
-
-enum GNUNET_GenericReturnValue
-check_code_challenge (const char *code_challenge,
-                      uint32_t code_challenge_len,
-                      const char *code_verifier)
-{
-  char *code_verifier_hash;
-  char *expected_code_challenge;
-
-  if (0 == code_challenge_len) /* Only check if this code requires a CV */
-    return GNUNET_OK;
-  if (NULL == code_verifier)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Expected code verifier!\n");
-    return GNUNET_SYSERR;
-  }
-  code_verifier_hash = GNUNET_malloc (256 / 8);
-  // hash code verifier
-  gcry_md_hash_buffer (GCRY_MD_SHA256,
-                       code_verifier_hash,
-                       code_verifier,
-                       strlen (code_verifier));
-  // encode code verifier
-  GNUNET_STRINGS_base64url_encode (code_verifier_hash, 256 / 8,
-                                   &expected_code_challenge);
-  GNUNET_free (code_verifier_hash);
-  if (0 !=
-      strncmp (expected_code_challenge, code_challenge, code_challenge_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Invalid code verifier! Expected: %s, Got: %.*s\n",
-                expected_code_challenge,
-                code_challenge_len,
-                code_challenge);
-    GNUNET_free (expected_code_challenge);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (expected_code_challenge);
-  return GNUNET_OK;
-}
-
-
-/**
- * Parse reclaim ticket and nonce from
- * authorization code.
- * This also verifies the signature in the code.
- *
- * @param audience the expected audience of the code
- * @param code the string representation of the code
- * @param code_verfier PKCE code verifier. Optional, must be provided
- *                     if used in request.
- * @param ticket where to store the ticket
- * @param attrs the attributes in the code
- * @param presentations credential presentation list
- * @param nonce_str where to store the nonce (if contained)
- * @return GNUNET_OK if successful, else GNUNET_SYSERR
- */
-int
-OIDC_parse_authz_code (const struct GNUNET_CRYPTO_PublicKey *audience,
-                       const char *code,
-                       const char *code_verifier,
-                       struct GNUNET_RECLAIM_Ticket *ticket,
-                       struct GNUNET_RECLAIM_AttributeList **attrs,
-                       struct GNUNET_RECLAIM_PresentationList **presentations,
-                       char **nonce_str,
-                       enum OIDC_VerificationOptions opts)
-{
-  char *code_payload;
-  char *ptr;
-  char *plaintext;
-  char *attrs_ser;
-  char *presentations_ser;
-  char *code_challenge;
-  struct GNUNET_CRYPTO_EccSignaturePurpose *purpose;
-  struct GNUNET_CRYPTO_Signature *signature;
-  uint32_t code_challenge_len;
-  uint32_t attrs_ser_len;
-  uint32_t pres_ser_len;
-  size_t plaintext_len;
-  size_t code_payload_len;
-  uint32_t nonce_len = 0;
-  struct OIDC_Parameters *params;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to decode `%s'\n", code);
-  code_payload = NULL;
-  code_payload_len =
-    GNUNET_STRINGS_base64url_decode (code, strlen (code),
-                                     (void **) &code_payload);
-  if (code_payload_len < sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-      + sizeof(struct OIDC_Parameters)
-      + sizeof(struct GNUNET_CRYPTO_Signature))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Authorization code malformed\n");
-    GNUNET_free (code_payload);
-    return GNUNET_SYSERR;
-  }
-
-  purpose = (struct GNUNET_CRYPTO_EccSignaturePurpose *) code_payload;
-  plaintext_len = code_payload_len;
-  plaintext_len -= sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose);
-  ptr = (char *) &purpose[1];
-  plaintext_len -= sizeof(struct GNUNET_CRYPTO_Signature);
-  plaintext = ptr;
-  ptr += plaintext_len;
-  signature = (struct GNUNET_CRYPTO_Signature *) ptr;
-  params = (struct OIDC_Parameters *) plaintext;
-
-  // cmp code_challenge code_verifier
-  code_challenge_len = ntohl (params->code_challenge_len);
-  code_challenge = ((char *) &params[1]);
-  if (! (opts & OIDC_VERIFICATION_NO_CODE_VERIFIER))
-  {
-    if (GNUNET_OK != check_code_challenge (code_challenge,
-                                           code_challenge_len,
-                                           code_verifier))
-    {
-      GNUNET_free (code_payload);
-      return GNUNET_SYSERR;
-    }
-  }
-  nonce_len = ntohl (params->nonce_len);
-  if (0 != nonce_len)
-  {
-    *nonce_str = GNUNET_strndup (code_challenge + code_challenge_len,
-                                 nonce_len);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got nonce: %s\n", *nonce_str);
-  }
-
-  // Ticket
-  memcpy (ticket, &params->ticket, sizeof(params->ticket));
-  // Signature
-  // GNUNET_CRYPTO_ecdsa_key_get_public (ecdsa_priv, &ecdsa_pub);
-  if (0 != GNUNET_memcmp (audience, &ticket->audience))
-  {
-    GNUNET_free (code_payload);
-    if (NULL != *nonce_str)
-      GNUNET_free (*nonce_str);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Audience in ticket does not match client!\n");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_signature_verify_ (
-        GNUNET_SIGNATURE_PURPOSE_RECLAIM_CODE_SIGN,
-        purpose,
-        signature,
-        &(ticket->identity)))
-  {
-    GNUNET_free (code_payload);
-    if (NULL != *nonce_str)
-      GNUNET_free (*nonce_str);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Signature of AuthZ code invalid!\n");
-    return GNUNET_SYSERR;
-  }
-  // Attributes
-  attrs_ser = ((char *) &params[1]) + code_challenge_len + nonce_len;
-  attrs_ser_len = ntohl (params->attr_list_len);
-  *attrs = GNUNET_RECLAIM_attribute_list_deserialize (attrs_ser, attrs_ser_len);
-  presentations_ser = ((char*) attrs_ser) + attrs_ser_len;
-  pres_ser_len = ntohl (params->pres_list_len);
-  *presentations =
-    GNUNET_RECLAIM_presentation_list_deserialize (presentations_ser,
-                                                  pres_ser_len);
-
-  GNUNET_free (code_payload);
-  return GNUNET_OK;
-}
-
-
-/**
- * Build a token response for a token request
- * TODO: Maybe we should add the scope here?
- *
- * @param access_token the access token to include
- * @param id_token the id_token to include
- * @param expiration_time the expiration time of the token(s)
- * @param token_response where to store the response
- */
-void
-OIDC_build_token_response (const char *access_token,
-                           const char *id_token,
-                           const struct GNUNET_TIME_Relative *expiration_time,
-                           char **token_response)
-{
-  json_t *root_json;
-
-  root_json = json_object ();
-
-  GNUNET_assert (NULL != access_token);
-  GNUNET_assert (NULL != id_token);
-  GNUNET_assert (NULL != expiration_time);
-  json_object_set_new (root_json, "access_token", json_string (access_token));
-  json_object_set_new (root_json, "token_type", json_string ("Bearer"));
-  json_object_set_new (root_json,
-                       "expires_in",
-                       json_integer (expiration_time->rel_value_us
-                                     / (1000 * 1000)));
-  json_object_set_new (root_json, "id_token", json_string (id_token));
-  *token_response = json_dumps (root_json, JSON_INDENT (0) | JSON_COMPACT);
-  json_decref (root_json);
-}
-
-
-/**
- * Generate a new access token
- */
-char *
-OIDC_access_token_new (const struct GNUNET_RECLAIM_Ticket *ticket)
-{
-  char *access_token;
-
-  GNUNET_STRINGS_base64_encode (ticket,
-                                sizeof(*ticket),
-                                &access_token);
-  return access_token;
-}
-
-
-/**
- * Parse an access token
- */
-int
-OIDC_access_token_parse (const char *token,
-                         struct GNUNET_RECLAIM_Ticket **ticket)
-{
-  size_t sret;
-  char *decoded;
-  sret = GNUNET_STRINGS_base64_decode (token,
-                                       strlen (token),
-                                       (void**) &decoded);
-  if (sizeof (struct GNUNET_RECLAIM_Ticket) != sret)
-  {
-    GNUNET_free (decoded);
-    return GNUNET_SYSERR;
-  }
-  *ticket = (struct GNUNET_RECLAIM_Ticket *) decoded;
-  return GNUNET_OK;
-}
-
-
-/**
- * Checks if a claim is implicitly requested through standard
- * scope(s) or explicitly through non-standard scope.
- *
- * @param scopes the scopes which have been requested
- * @param attr the attribute name to check
- * @return GNUNET_YES if attribute is implcitly requested
- */
-enum GNUNET_GenericReturnValue
-OIDC_check_scopes_for_claim_request (const char*scopes,
-                                     const char*attr)
-{
-  char *scope_variables;
-  char *scope_variable;
-  char delimiter[] = " ";
-  int i;
-
-  scope_variables = GNUNET_strdup (scopes);
-  scope_variable = strtok (scope_variables, delimiter);
-  while (NULL != scope_variable)
-  {
-    if (0 == strcmp ("profile", scope_variable))
-    {
-      for (i = 0; i < 14; i++)
-      {
-        if (0 == strcmp (attr, OIDC_profile_claims[i]))
-        {
-          GNUNET_free (scope_variables);
-          return GNUNET_YES;
-        }
-      }
-    }
-    else if (0 == strcmp ("address", scope_variable))
-    {
-      for (i = 0; i < 5; i++)
-      {
-        if (0 == strcmp (attr, OIDC_address_claims[i]))
-        {
-          GNUNET_free (scope_variables);
-          return GNUNET_YES;
-        }
-      }
-    }
-    else if (0 == strcmp ("email", scope_variable))
-    {
-      for (i = 0; i < 2; i++)
-      {
-        if (0 == strcmp (attr, OIDC_email_claims[i]))
-        {
-          GNUNET_free (scope_variables);
-          return GNUNET_YES;
-        }
-      }
-    }
-    else if (0 == strcmp ("phone", scope_variable))
-    {
-      for (i = 0; i < 2; i++)
-      {
-        if (0 == strcmp (attr, OIDC_phone_claims[i]))
-        {
-          GNUNET_free (scope_variables);
-          return GNUNET_YES;
-        }
-      }
-
-    }
-    else if (0 == strcmp (attr, scope_variable))
-    {
-      /** attribute matches requested scope **/
-      GNUNET_free (scope_variables);
-      return GNUNET_YES;
-    }
-    scope_variable = strtok (NULL, delimiter);
-  }
-  GNUNET_free (scope_variables);
-  return GNUNET_NO;
-
-}
diff --git a/src/reclaim/oidc_helper.h b/src/reclaim/oidc_helper.h
deleted file mode 100644
index de788fbdb..000000000
--- a/src/reclaim/oidc_helper.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/oidc_helper.h
- * @brief helper library for OIDC related functions
- * @author Martin Schanzenbach
- */
-
-#ifndef JWT_H
-#define JWT_H
-
-#define JWT_ALG "alg"
-#define JWT_TYP "typ"
-#define JWT_TYP_VALUE "jwt"
-
-#define JWT_ALG_VALUE_HMAC "HS512"
-#define JWT_ALG_VALUE_RSA "RS256"
-
-#define SERVER_ADDRESS "http://localhost:7776"
-
-enum OIDC_VerificationOptions
-{
-  /**
-   * Strict verification
-   */
-  OIDC_VERIFICATION_DEFAULT = 0,
-
-  /**
-   * Do not check code verifier even if expected
-   */
-  OIDC_VERIFICATION_NO_CODE_VERIFIER = 1
-};
-
-/**
- * Create a JWT using RSA256 algorithm from attributes
- *
- * @param aud_key the public of the audience
- * @param sub_key the public key of the subject
- * @param attrs the attribute list
- * @param presentations credential presentation list (may be empty)
- * @param expiration_time the validity of the token
- * @param secret_rsa_key the key used to sign the JWT
- * @return a new base64-encoded JWT string.
- */
-char *
-OIDC_generate_id_token_rsa (const struct GNUNET_CRYPTO_PublicKey *aud_key,
-                            const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                            const struct GNUNET_RECLAIM_AttributeList *attrs,
-                            const struct
-                            GNUNET_RECLAIM_PresentationList *presentations,
-                            const struct GNUNET_TIME_Relative *expiration_time,
-                            const char *nonce,
-                            const json_t *secret_rsa_key);
-
-/**
- * Create a JWT using HMAC (HS256) from attributes
- *
- * @param aud_key the public of the audience
- * @param sub_key the public key of the subject
- * @param attrs the attribute list
- * @param presentations credential presentation list (may be empty)
- * @param expiration_time the validity of the token
- * @param secret_key the key used to sign the JWT
- * @return a new base64-encoded JWT string.
- */
-char*
-OIDC_generate_id_token_hmac (const struct GNUNET_CRYPTO_PublicKey *aud_key,
-                             const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                             const struct GNUNET_RECLAIM_AttributeList *attrs,
-                             const struct
-                             GNUNET_RECLAIM_PresentationList *presentations,
-                             const struct GNUNET_TIME_Relative *expiration_time,
-                             const char *nonce,
-                             const char *secret_key);
-
-/**
- * Builds an OIDC authorization code including
- * a reclaim ticket and nonce
- *
- * @param issuer the issuer of the ticket, used to sign the ticket and nonce
- * @param ticket the ticket to include in the code
- * @param attrs list of attributes to share
- * @param presentations credential presentation list
- * @param nonce the nonce to include in the code
- * @param code_challenge PKCE code challenge
- * @param opts verification options
- * @return a new authorization code (caller must free)
- */
-char*
-OIDC_build_authz_code (const struct GNUNET_CRYPTO_PrivateKey *issuer,
-                       const struct GNUNET_RECLAIM_Ticket *ticket,
-                       const struct GNUNET_RECLAIM_AttributeList *attrs,
-                       const struct
-                       GNUNET_RECLAIM_PresentationList *presentations,
-                       const char *nonce,
-                       const char *code_challenge);
-
-/**
- * Parse reclaim ticket and nonce from
- * authorization code.
- * This also verifies the signature in the code.
- *
- * @param ecdsa_priv the audience of the ticket
- * @param code the string representation of the code
- * @param code_verfier PKCE code verifier
- * @param ticket where to store the ticket
- * @param attrs the attributes found in the code
- * @param presentations credential presentation list
- * @param nonce where to store the nonce
- * @return GNUNET_OK if successful, else GNUNET_SYSERR
- */
-int
-OIDC_parse_authz_code (const struct GNUNET_CRYPTO_PublicKey *ecdsa_pub,
-                       const char *code,
-                       const char *code_verifier,
-                       struct GNUNET_RECLAIM_Ticket *ticket,
-                       struct GNUNET_RECLAIM_AttributeList **attrs,
-                       struct GNUNET_RECLAIM_PresentationList **presentations,
-                       char **nonce,
-                       enum OIDC_VerificationOptions opts);
-
-/**
- * Build a token response for a token request
- * TODO: Maybe we should add the scope here?
- *
- * @param access_token the access token to include
- * @param id_token the id_token to include
- * @param expiration_time the expiration time of the token(s)
- * @param token_response where to store the response
- */
-void
-OIDC_build_token_response (const char *access_token,
-                           const char *id_token,
-                           const struct GNUNET_TIME_Relative *expiration_time,
-                           char **token_response);
-
-/**
- * Generate a new access token
- */
-char*
-OIDC_access_token_new (const struct GNUNET_RECLAIM_Ticket *ticket);
-
-/**
- * Parse an access token
- */
-int
-OIDC_access_token_parse (const char *token,
-                         struct GNUNET_RECLAIM_Ticket **ticket);
-
-
-/**
- * Checks if a claim is implicitly requested through standard
- * scope(s)
- *
- * @param scopes the scopes which have been requested
- * @param attr the attribute name to check
- * @return GNUNET_YES if attribute is implcitly requested
- */
-enum GNUNET_GenericReturnValue
-OIDC_check_scopes_for_claim_request (const char *scopes,
-                                     const char *attr);
-
-
-/**
- * Generate userinfo JSON as string
- *
- * @param sub_key the subject (user)
- * @param attrs user attribute list
- * @param presentations credential presentation list
- * @return Userinfo JSON
- */
-char *
-OIDC_generate_userinfo (const struct GNUNET_CRYPTO_PublicKey *sub_key,
-                        const struct GNUNET_RECLAIM_AttributeList *attrs,
-                        const struct
-                        GNUNET_RECLAIM_PresentationList *presentations);
-
-#endif
diff --git a/src/reclaim/pabc_helper.c b/src/reclaim/pabc_helper.c
deleted file mode 100644
index 65a633f7b..000000000
--- a/src/reclaim/pabc_helper.c
+++ /dev/null
@@ -1,366 +0,0 @@
-// maximilian.kaul@aisec.fraunhofer.de
-
-// WIP implementation of
-// https://github.com/ontio/ontology-crypto/wiki/Anonymous-Credential
-// using the relic library https://github.com/relic-toolkit/relic/
-
-#include "platform.h"
-#include "pabc_helper.h"
-#include <pwd.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-static char pabc_dir[PATH_MAX + 1];
-
-static const char *
-get_homedir ()
-{
-  const char *homedir;
-  if ((homedir = getenv ("HOME")) == NULL)
-  {
-    homedir = getpwuid (getuid ())->pw_dir;
-  }
-  return homedir;
-}
-
-
-static enum GNUNET_GenericReturnValue
-write_file (char const *const filename, const char *buffer)
-{
-  struct GNUNET_DISK_FileHandle *fh;
-  fh = GNUNET_DISK_file_open (filename,
-                              GNUNET_DISK_OPEN_WRITE
-                              | GNUNET_DISK_OPEN_TRUNCATE
-                              | GNUNET_DISK_OPEN_CREATE,
-                              GNUNET_DISK_PERM_USER_WRITE
-                              | GNUNET_DISK_PERM_USER_READ);
-  if (fh == NULL)
-    return GNUNET_SYSERR;
-  if (GNUNET_SYSERR == GNUNET_DISK_file_write (fh,
-                                               buffer, strlen (buffer) + 1))
-    goto fail;
-  GNUNET_DISK_file_close (fh);
-  return GNUNET_OK;
-
-fail:
-  GNUNET_DISK_file_close (fh);
-  return GNUNET_SYSERR;
-}
-
-
-static enum GNUNET_GenericReturnValue
-init_pabc_dir ()
-{
-  size_t filename_size = strlen (get_homedir ()) + 1 + strlen (".local") + 1
-                         + strlen ("pabc-reclaim") + 1;
-  snprintf (pabc_dir, filename_size, "%s/%s/%s",
-            get_homedir (), ".local", "pabc-reclaim");
-  return GNUNET_DISK_directory_create (pabc_dir);
-}
-
-
-static const char *
-get_pabcdir ()
-{
-  init_pabc_dir ();
-  return pabc_dir;
-}
-
-
-enum GNUNET_GenericReturnValue
-read_file (char const *const filename, char **buffer)
-{
-  struct GNUNET_DISK_FileHandle *fh;
-  if (GNUNET_YES != GNUNET_DISK_file_test (filename))
-    return GNUNET_SYSERR;
-
-  fh = GNUNET_DISK_file_open (filename,
-                              GNUNET_DISK_OPEN_READ,
-                              GNUNET_DISK_PERM_USER_READ);
-  if (fh == NULL)
-    return GNUNET_SYSERR;
-  long lSize = GNUNET_DISK_file_seek (fh, 0, GNUNET_DISK_SEEK_END);
-  if (lSize < 0)
-    goto fail;
-  GNUNET_DISK_file_seek (fh, 0, GNUNET_DISK_SEEK_SET);
-  *buffer = calloc ((size_t) lSize + 1, sizeof(char));
-  if (*buffer == NULL)
-    goto fail;
-
-  // copy the file into the buffer:
-  size_t r = GNUNET_DISK_file_read (fh, *buffer, (size_t) lSize);
-  if (r != (size_t) lSize)
-    goto fail;
-
-  GNUNET_DISK_file_close (fh);
-  return GNUNET_OK;
-
-fail:
-  GNUNET_DISK_file_close (fh);
-  GNUNET_free (*buffer);
-  return GNUNET_SYSERR;
-}
-
-
-struct pabc_public_parameters *
-PABC_read_issuer_ppfile (const char *f, struct pabc_context *const ctx)
-{
-  if (NULL == ctx)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No global context provided\n");
-    return NULL;
-  }
-  struct pabc_public_parameters *pp;
-  char *buffer;
-  int r;
-  r = read_file (f, &buffer);
-  if (GNUNET_OK != r)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error reading file\n");
-    return NULL;
-  }
-  if (PABC_OK != pabc_decode_and_new_public_parameters (ctx, &pp, buffer))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to decode public parameters\n");
-    PABC_FREE_NULL (buffer);
-    return NULL;
-  }
-  PABC_FREE_NULL (buffer);
-  return pp;
-}
-
-
-enum GNUNET_GenericReturnValue
-PABC_load_public_parameters (struct pabc_context *const ctx,
-                             char const *const pp_name,
-                             struct pabc_public_parameters **pp)
-{
-  char fname[PATH_MAX];
-  char *pp_filename;
-  const char *pdir = get_pabcdir ();
-
-  if (ctx == NULL)
-    return GNUNET_SYSERR;
-  if (pp_name == NULL)
-    return GNUNET_SYSERR;
-
-  GNUNET_STRINGS_urlencode (pp_name, strlen (pp_name), &pp_filename);
-  if (GNUNET_YES != GNUNET_DISK_directory_test (pdir, GNUNET_YES))
-  {
-    GNUNET_free (pp_filename);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error reading %s\n", pdir);
-    return GNUNET_SYSERR;
-  }
-  snprintf (fname, PATH_MAX, "%s/%s%s", pdir, pp_filename, PABC_PP_EXT);
-  if (GNUNET_YES != GNUNET_DISK_file_test (fname))
-  {
-    GNUNET_free (pp_filename);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error testing %s\n", fname);
-    return GNUNET_SYSERR;
-  }
-  *pp = PABC_read_issuer_ppfile (fname, ctx);
-  if (*pp)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-
-enum GNUNET_GenericReturnValue
-PABC_write_public_parameters (char const *const pp_name,
-                              struct pabc_public_parameters *const pp)
-{
-  char *json;
-  char *filename;
-  char *pp_filename;
-  enum pabc_status status;
-  struct pabc_context *ctx = NULL;
-
-  GNUNET_STRINGS_urlencode (pp_name, strlen (pp_name), &pp_filename);
-  PABC_ASSERT (pabc_new_ctx (&ctx));
-  // store in json file
-  status = pabc_encode_public_parameters (ctx, pp, &json);
-  if (status != PABC_OK)
-  {
-    GNUNET_free (pp_filename);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to encode public parameters.\n");
-    pabc_free_ctx (&ctx);
-    return GNUNET_SYSERR;
-  }
-
-  size_t filename_size =
-    strlen (get_pabcdir ()) + 1 + strlen (pp_filename) + strlen (PABC_PP_EXT)
-    + 1;
-  filename = GNUNET_malloc (filename_size);
-  if (! filename)
-  {
-    GNUNET_free (pp_filename);
-    PABC_FREE_NULL (json);
-    pabc_free_ctx (&ctx);
-    return GNUNET_SYSERR;
-  }
-  snprintf (filename, filename_size, "%s/%s%s", get_pabcdir (), pp_filename,
-            PABC_PP_EXT);
-
-  GNUNET_free (pp_filename);
-  if (GNUNET_OK != write_file (filename, json))
-  {
-    PABC_FREE_NULL (filename);
-    PABC_FREE_NULL (json);
-    pabc_free_ctx (&ctx);
-    return GNUNET_SYSERR;
-  }
-  PABC_FREE_NULL (filename);
-  PABC_FREE_NULL (json);
-  pabc_free_ctx (&ctx);
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-PABC_write_usr_ctx (char const *const usr_name,
-                    char const *const pp_name,
-                    struct pabc_context const *const ctx,
-                    struct pabc_public_parameters const *const pp,
-                    struct pabc_user_context *const usr_ctx)
-{
-
-  char *pp_filename;
-  char *json = NULL;
-  enum pabc_status status;
-  char *fname = NULL;
-
-  if (NULL == usr_name)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No issuer given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == pp_name)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No user given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == ctx)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No context given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == pp)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No public parameters given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == usr_ctx)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No user context given.\n");
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_STRINGS_urlencode (pp_name, strlen (pp_name), &pp_filename);
-  status = pabc_encode_user_ctx (ctx, pp, usr_ctx, &json);
-  if (PABC_OK != status)
-  {
-    GNUNET_free (pp_filename);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to encode user context.\n");
-    return status;
-  }
-
-  size_t fname_size = strlen (get_pabcdir ()) + 1 + strlen (usr_name) + 1
-                      + strlen (pp_filename) + strlen (PABC_USR_EXT) + 1;
-  fname = GNUNET_malloc (fname_size);
-
-  snprintf (fname, fname_size, "%s/%s_%s%s", get_pabcdir (), usr_name,
-            pp_filename,
-            PABC_USR_EXT);
-
-  GNUNET_free (pp_filename);
-  if (GNUNET_OK == write_file (fname, json))
-  {
-    GNUNET_free (fname);
-    GNUNET_free (json);
-    return GNUNET_OK;
-  }
-  else
-  {
-    GNUNET_free (fname);
-    GNUNET_free (json);
-    return GNUNET_SYSERR;
-  }
-}
-
-
-enum GNUNET_GenericReturnValue
-PABC_read_usr_ctx (char const *const usr_name,
-                   char const *const pp_name,
-                   struct pabc_context const *const ctx,
-                   struct pabc_public_parameters const *const pp,
-                   struct pabc_user_context **usr_ctx)
-{
-  char *json = NULL;
-  char *pp_filename;
-  enum pabc_status status;
-
-  char *fname = NULL;
-
-  if (NULL == usr_name)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No issuer given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == pp_name)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No user given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == ctx)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No context given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == pp)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No public parameters given.\n");
-    return GNUNET_SYSERR;
-  }
-  if (NULL == usr_ctx)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No user context given.\n");
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STRINGS_urlencode (pp_name, strlen (pp_name), &pp_filename);
-
-  size_t fname_size = strlen (get_pabcdir ()) + 1 + strlen (usr_name) + 1
-                      + strlen (pp_filename) + strlen (PABC_USR_EXT) + 1;
-  fname = GNUNET_malloc (fname_size);
-  snprintf (fname, fname_size, "%s/%s_%s%s", get_pabcdir (), usr_name,
-            pp_filename,
-            PABC_USR_EXT);
-  GNUNET_free (pp_filename);
-  if (GNUNET_OK != read_file (fname, &json))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read `%s'\n", fname);
-    PABC_FREE_NULL (fname);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (fname);
-
-  status = pabc_new_user_context (ctx, pp, usr_ctx);
-  if (PABC_OK != status)
-  {
-    GNUNET_free (json);
-    return GNUNET_SYSERR;
-  }
-  status = pabc_decode_user_ctx (ctx, pp, *usr_ctx, json);
-  GNUNET_free (json);
-  if (PABC_OK != status)
-  {
-    pabc_free_user_context (ctx, pp, usr_ctx);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to encode user context.\n");
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_OK;
-}
diff --git a/src/reclaim/pabc_helper.h b/src/reclaim/pabc_helper.h
deleted file mode 100644
index 045ad5dda..000000000
--- a/src/reclaim/pabc_helper.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include <pabc/pabc.h>
-
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-#define PABC_ISK_EXT ".isk"
-
-#define PABC_PP_EXT ".pp"
-
-#define PABC_USR_EXT ".usr"
-
-#define PABC_ATTR_DELIM "="
-
-enum GNUNET_GenericReturnValue
-PABC_write_public_parameters (char const *const pp_name,
-                              struct pabc_public_parameters *const pp);
-
-
-enum GNUNET_GenericReturnValue
-PABC_load_public_parameters (struct pabc_context *const ctx,
-                             char const *const pp_name,
-                             struct pabc_public_parameters **pp);
-
-enum GNUNET_GenericReturnValue
-PABC_write_usr_ctx (char const *const user_name,
-                    char const *const pp_name,
-                    struct pabc_context const *const ctx,
-                    struct pabc_public_parameters const *const
-                    pp,
-                    struct pabc_user_context *const usr_ctx);
-
-enum GNUNET_GenericReturnValue
-PABC_read_usr_ctx (char const *const user_name,
-                   char const *const pp_name,
-                   struct pabc_context const *const ctx,
-                   struct pabc_public_parameters const *const
-                   pp,
-                   struct pabc_user_context **usr_ctx);
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c
deleted file mode 100644
index ce6fe483d..000000000
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2013, 2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/plugin_gnsrecord_reclaim.c
- * @brief gnsrecord plugin to provide the API for identity records
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-
-#include "gnunet_util_lib.h"
-
-#include "gnunet_gnsrecord_lib.h"
-#include "gnunet_gnsrecord_plugin.h"
-
-/**
- * Convert the 'value' of a record to a string.
- *
- * @param cls closure, unused
- * @param type type of the record
- * @param data value in binary encoding
- * @param data_size number of bytes in @a data
- * @return NULL on error, otherwise human-readable representation of the value
- */
-static char *
-value_to_string (void *cls, uint32_t type, const void *data, size_t data_size)
-{
-  switch (type)
-  {
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
-    return GNUNET_strndup (data, data_size);
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION:
-    return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
-
-  default:
-    return NULL;
-  }
-}
-
-
-/**
- * Convert human-readable version of a 'value' of a record to the binary
- * representation.
- *
- * @param cls closure, unused
- * @param type type of the record
- * @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
- */
-static int
-string_to_value (void *cls, uint32_t type, const char *s, void **data,
-                 size_t *data_size)
-{
-  if (NULL == s)
-    return GNUNET_SYSERR;
-  switch (type)
-  {
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
-    *data = GNUNET_strdup (s);
-    *data_size = strlen (s);
-    return GNUNET_OK;
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION:
-    return GNUNET_STRINGS_string_to_data (s, strlen (s), *data, *data_size);
-
-  default:
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Mapping of record type numbers to human-readable
- * record type names.
- */
-static struct
-{
-  const char *name;
-  uint32_t number;
-} name_map[] = {
-  { "RECLAIM_ATTRIBUTE", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE },
-  { "RECLAIM_ATTRIBUTE_REF", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF },
-  { "RECLAIM_CREDENTIAL", GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL },
-  { "RECLAIM_PRESENTATION", GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION },
-  { "RECLAIM_OIDC_CLIENT", GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT },
-  { "RECLAIM_OIDC_REDIRECT", GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT },
-  { "RECLAIM_TICKET", GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET },
-  { NULL, UINT32_MAX }
-};
-
-
-/**
- * Convert a type name (e.g. "AAAA") to the corresponding number.
- *
- * @param cls closure, unused
- * @param dns_typename name to convert
- * @return corresponding number, UINT32_MAX on error
- */
-static uint32_t
-typename_to_number (void *cls, const char *dns_typename)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != name_map[i].name) &&
-         (0 != strcasecmp (dns_typename, name_map[i].name)))
-    i++;
-  return name_map[i].number;
-}
-
-
-/**
- * Convert a type number to the corresponding type string (e.g. 1 to "A")
- *
- * @param cls closure, unused
- * @param type number of a type to convert
- * @return corresponding typestring, NULL on error
- */
-static const char *
-number_to_typename (void *cls, uint32_t type)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != name_map[i].name) && (type != name_map[i].number))
-    i++;
-  return name_map[i].name;
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_plugin_gnsrecord_reclaim_init (void *cls)
-{
-  struct GNUNET_GNSRECORD_PluginFunctions *api;
-
-  api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions);
-  api->value_to_string = &value_to_string;
-  api->string_to_value = &string_to_value;
-  api->typename_to_number = &typename_to_number;
-  api->number_to_typename = &number_to_typename;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_plugin_block_test_init
- * @return NULL
- */
-void *
-libgnunet_plugin_gnsrecord_reclaim_done (void *cls)
-{
-  struct GNUNET_GNSRECORD_PluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_gnsrecord_dns.c */
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c b/src/reclaim/plugin_reclaim_attribute_basic.c
deleted file mode 100644
index 66f59998a..000000000
--- a/src/reclaim/plugin_reclaim_attribute_basic.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2013, 2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim-attribute/plugin_reclaim_attribute_gnuid.c
- * @brief reclaim-attribute-plugin-gnuid attribute plugin to provide the API for
- *                                       fundamental
- *                                       attribute types.
- *
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_plugin.h"
-#include <inttypes.h>
-
-
-/**
- * Convert the 'value' of an attribute to a string.
- *
- * @param cls closure, unused
- * @param type type of the attribute
- * @param data value in binary encoding
- * @param data_size number of bytes in @a data
- * @return NULL on error, otherwise human-readable representation of the value
- */
-static char *
-basic_value_to_string (void *cls,
-                       uint32_t type,
-                       const void *data,
-                       size_t data_size)
-{
-  switch (type)
-  {
-  case GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING:
-    return GNUNET_strndup (data, data_size);
-
-  default:
-    return NULL;
-  }
-}
-
-
-/**
- * Convert human-readable version of a 'value' of an attribute to the binary
- * representation.
- *
- * @param cls closure, unused
- * @param type type of the attribute
- * @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
- */
-static int
-basic_string_to_value (void *cls,
-                       uint32_t type,
-                       const char *s,
-                       void **data,
-                       size_t *data_size)
-{
-  if (NULL == s)
-    return GNUNET_SYSERR;
-  switch (type)
-  {
-  case GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING:
-    *data = GNUNET_strdup (s);
-    *data_size = strlen (s) + 1;
-    return GNUNET_OK;
-
-  default:
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Mapping of attribute type numbers to human-readable
- * attribute type names.
- */
-static struct
-{
-  const char *name;
-  uint32_t number;
-} basic_name_map[] = { { "STRING", GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING },
-                       { NULL, UINT32_MAX } };
-
-
-/**
- * Convert a type name to the corresponding number.
- *
- * @param cls closure, unused
- * @param basic_typename name to convert
- * @return corresponding number, UINT32_MAX on error
- */
-static uint32_t
-basic_typename_to_number (void *cls, const char *basic_typename)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != basic_name_map[i].name) &&
-         (0 != strcasecmp (basic_typename, basic_name_map[i].name)))
-    i++;
-  return basic_name_map[i].number;
-}
-
-
-/**
- * Convert a type number to the corresponding type string (e.g. 1 to "A")
- *
- * @param cls closure, unused
- * @param type number of a type to convert
- * @return corresponding typestring, NULL on error
- */
-static const char *
-basic_number_to_typename (void *cls, uint32_t type)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != basic_name_map[i].name) && (type != basic_name_map[i].number))
-    i++;
-  return basic_name_map[i].name;
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_plugin_reclaim_attribute_basic_init (void *cls)
-{
-  struct GNUNET_RECLAIM_AttributePluginFunctions *api;
-
-  api = GNUNET_new (struct GNUNET_RECLAIM_AttributePluginFunctions);
-  api->value_to_string = &basic_value_to_string;
-  api->string_to_value = &basic_string_to_value;
-  api->typename_to_number = &basic_typename_to_number;
-  api->number_to_typename = &basic_number_to_typename;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_plugin_block_test_init()
- * @return NULL
- */
-void *
-libgnunet_plugin_reclaim_attribute_basic_done (void *cls)
-{
-  struct GNUNET_RECLAIM_AttributePluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_reclaim_attribute_type_gnuid.c */
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/reclaim/plugin_reclaim_credential_jwt.c
deleted file mode 100644
index 3eb4bfebf..000000000
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2013, 2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/plugin_reclaim_credential_jwt.c
- * @brief reclaim-credential-plugin-jwt attribute plugin to provide the API for
- *                                      JWT credentials.
- *
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_plugin.h"
-#include <inttypes.h>
-#include <jansson.h>
-
-/**
-   * Convert the 'value' of an credential to a string.
-   *
-   * @param cls closure, unused
-   * @param type type of the credential
-   * @param data value in binary encoding
-   * @param data_size number of bytes in @a data
-   * @return NULL on error, otherwise human-readable representation of the value
-   */
-static char *
-jwt_value_to_string (void *cls,
-                     uint32_t type,
-                     const void *data,
-                     size_t data_size)
-{
-  switch (type)
-  {
-  case GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT:
-    return GNUNET_strndup (data, data_size);
-
-  default:
-    return NULL;
-  }
-}
-
-
-/**
- * Convert human-readable version of a 'value' of an credential to the binary
- * representation.
- *
- * @param cls closure, unused
- * @param type type of the credential
- * @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
- */
-static int
-jwt_string_to_value (void *cls,
-                     uint32_t type,
-                     const char *s,
-                     void **data,
-                     size_t *data_size)
-{
-  if (NULL == s)
-    return GNUNET_SYSERR;
-  switch (type)
-  {
-  case GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT:
-    *data = GNUNET_strdup (s);
-    *data_size = strlen (s) + 1;
-    return GNUNET_OK;
-
-  default:
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Mapping of credential type numbers to human-readable
- * credential type names.
- */
-static struct
-{
-  const char *name;
-  uint32_t number;
-} jwt_cred_name_map[] = { { "JWT", GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT },
-                          { NULL, UINT32_MAX } };
-
-/**
-   * Convert a type name to the corresponding number.
-   *
-   * @param cls closure, unused
-   * @param jwt_typename name to convert
-   * @return corresponding number, UINT32_MAX on error
-   */
-static uint32_t
-jwt_typename_to_number (void *cls, const char *jwt_typename)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != jwt_cred_name_map[i].name) &&
-         (0 != strcasecmp (jwt_typename, jwt_cred_name_map[i].name)))
-    i++;
-  return jwt_cred_name_map[i].number;
-}
-
-
-/**
- * Convert a type number to the corresponding type string (e.g. 1 to "A")
- *
- * @param cls closure, unused
- * @param type number of a type to convert
- * @return corresponding typestring, NULL on error
- */
-static const char *
-jwt_number_to_typename (void *cls, uint32_t type)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != jwt_cred_name_map[i].name) && (type !=
-                                                 jwt_cred_name_map[i].
-                                                 number))
-    i++;
-  return jwt_cred_name_map[i].name;
-}
-
-
-/**
- * Parse a JWT and return the respective claim value as Attribute
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_AttributeList *
-jwt_parse_attributes (void *cls,
-                      const char *data,
-                      size_t data_size)
-{
-  char *jwt_string;
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-  char delim[] = ".";
-  char *val_str = NULL;
-  char *decoded_jwt;
-  char *tmp;
-  json_t *json_val;
-  json_error_t json_err;
-
-  attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-
-  jwt_string = GNUNET_strndup (data, data_size);
-  const char *jwt_body = strtok (jwt_string, delim);
-  if (NULL == jwt_body)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to parse JSON %s\n", jwt_string);
-    return attrs;
-  }
-  jwt_body = strtok (NULL, delim);
-  if (NULL == jwt_body)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to parse JSON %s\n", jwt_string);
-    GNUNET_free (jwt_string);
-    return attrs;
-  }
-  GNUNET_STRINGS_base64url_decode (jwt_body, strlen (jwt_body),
-                                   (void **) &decoded_jwt);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Decoded JWT: %s\n", decoded_jwt);
-  GNUNET_assert (NULL != decoded_jwt);
-  json_val = json_loads (decoded_jwt, JSON_DECODE_ANY, &json_err);
-  GNUNET_free (decoded_jwt);
-  const char *key;
-  const char *addr_key;
-  json_t *value;
-  json_t *addr_value;
-
-  json_object_foreach (json_val, key, value) {
-    if (0 == strcmp ("iss", key))
-      continue;
-    if (0 == strcmp ("jti", key))
-      continue;
-    if (0 == strcmp ("exp", key))
-      continue;
-    if (0 == strcmp ("iat", key))
-      continue;
-    if (0 == strcmp ("nbf", key))
-      continue;
-    if (0 == strcmp ("aud", key))
-      continue;
-    if (0 == strcmp ("address", key))
-    {
-      if (! json_is_object (value))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "address claim in wrong format!");
-        continue;
-      }
-      json_object_foreach (value, addr_key, addr_value) {
-        val_str = json_dumps (addr_value, JSON_ENCODE_ANY);
-        tmp = val_str;
-        // Remove leading " from jasson conversion
-        if (tmp[0] == '"')
-          tmp++;
-        // Remove trailing " from jansson conversion
-        if (tmp[strlen (tmp) - 1] == '"')
-          tmp[strlen (tmp) - 1] = '\0';
-        GNUNET_RECLAIM_attribute_list_add (attrs,
-                                           addr_key,
-                                           NULL,
-                                           GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING,
-                                           tmp,
-                                           strlen (val_str));
-        GNUNET_free (val_str);
-      }
-      continue;
-    }
-    val_str = json_dumps (value, JSON_ENCODE_ANY);
-    tmp = val_str;
-    // Remove leading " from jasson conversion
-    if (tmp[0] == '"')
-      tmp++;
-    // Remove trailing " from jansson conversion
-    if (tmp[strlen (tmp) - 1] == '"')
-      tmp[strlen (tmp) - 1] = '\0';
-    GNUNET_RECLAIM_attribute_list_add (attrs,
-                                       key,
-                                       NULL,
-                                       GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING,// FIXME
-                                       tmp,
-                                       strlen (val_str));
-    GNUNET_free (val_str);
-  }
-  json_decref (json_val);
-  GNUNET_free (jwt_string);
-  return attrs;
-}
-
-
-/**
- * Parse a JWT and return the respective claim value as Attribute
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_AttributeList *
-jwt_parse_attributes_c (void *cls,
-                        const struct GNUNET_RECLAIM_Credential *cred)
-{
-  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT)
-    return NULL;
-  return jwt_parse_attributes (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a JWT and return the respective claim value as Attribute
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_AttributeList *
-jwt_parse_attributes_p (void *cls,
-                        const struct GNUNET_RECLAIM_Presentation *cred)
-{
-  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT)
-    return NULL;
-  return jwt_parse_attributes (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a JWT and return the issuer
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a string, containing the isser
- */
-char *
-jwt_get_issuer (void *cls,
-                const char *data,
-                size_t data_size)
-{
-  const char *jwt_body;
-  char *jwt_string;
-  char delim[] = ".";
-  char *issuer = NULL;
-  char *decoded_jwt;
-  json_t *issuer_json;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Parsing JWT attributes.\n");
-  json_t *json_val;
-  json_error_t json_err;
-
-  jwt_string = GNUNET_strndup (data, data_size);
-  jwt_body = strtok (jwt_string, delim);
-  jwt_body = strtok (NULL, delim);
-  GNUNET_STRINGS_base64url_decode (jwt_body, strlen (jwt_body),
-                                   (void **) &decoded_jwt);
-  json_val = json_loads (decoded_jwt, JSON_DECODE_ANY, &json_err);
-  GNUNET_free (decoded_jwt);
-  GNUNET_free (jwt_string);
-  if (NULL == json_val)
-    return NULL;
-  issuer_json = json_object_get (json_val, "iss");
-  if ((NULL == issuer_json) || (! json_is_string (issuer_json)))
-  {
-    json_decref (json_val);
-    return NULL;
-  }
-  issuer = GNUNET_strdup (json_string_value (issuer_json));
-  json_decref (json_val);
-  return issuer;
-}
-
-
-/**
- * Parse a JWT and return the issuer
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a string, containing the isser
- */
-char *
-jwt_get_issuer_c (void *cls,
-                  const struct GNUNET_RECLAIM_Credential *cred)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
-    return NULL;
-  return jwt_get_issuer (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a JWT and return the issuer
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a string, containing the isser
- */
-char *
-jwt_get_issuer_p (void *cls,
-                  const struct GNUNET_RECLAIM_Presentation *cred)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
-    return NULL;
-  return jwt_get_issuer (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a JWT and return the expiration
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a string, containing the isser
- */
-enum GNUNET_GenericReturnValue
-jwt_get_expiration (void *cls,
-                    const char *data,
-                    size_t data_size,
-                    struct GNUNET_TIME_Absolute *exp)
-{
-  const char *jwt_body;
-  char *jwt_string;
-  char delim[] = ".";
-  char *decoded_jwt;
-  json_t *exp_json;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Parsing JWT attributes.\n");
-  json_t *json_val;
-  json_error_t json_err;
-
-  jwt_string = GNUNET_strndup (data, data_size);
-  jwt_body = strtok (jwt_string, delim);
-  jwt_body = strtok (NULL, delim);
-  GNUNET_STRINGS_base64url_decode (jwt_body, strlen (jwt_body),
-                                   (void **) &decoded_jwt);
-  json_val = json_loads (decoded_jwt, JSON_DECODE_ANY, &json_err);
-  GNUNET_free (decoded_jwt);
-  GNUNET_free (jwt_string);
-  if (NULL == json_val)
-    return GNUNET_SYSERR;
-  exp_json = json_object_get (json_val, "exp");
-  if ((NULL == exp_json) || (! json_is_integer (exp_json)))
-  {
-    json_decref (json_val);
-    return GNUNET_SYSERR;
-  }
-  exp->abs_value_us = json_integer_value (exp_json) * 1000 * 1000;
-  json_decref (json_val);
-  return GNUNET_OK;
-}
-
-
-/**
- * Parse a JWT and return the expiration
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return the expirati
- */
-enum GNUNET_GenericReturnValue
-jwt_get_expiration_c (void *cls,
-                      const struct GNUNET_RECLAIM_Credential *cred,
-                      struct GNUNET_TIME_Absolute *exp)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
-    return GNUNET_NO;
-  return jwt_get_expiration (cls, cred->data, cred->data_size, exp);
-}
-
-
-/**
- * Parse a JWT and return the expiration
- *
- * @param cls the plugin
- * @param cred the jwt credential
- * @return a string, containing the isser
- */
-enum GNUNET_GenericReturnValue
-jwt_get_expiration_p (void *cls,
-                      const struct GNUNET_RECLAIM_Presentation *cred,
-                      struct GNUNET_TIME_Absolute *exp)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
-    return GNUNET_NO;
-  return jwt_get_expiration (cls, cred->data, cred->data_size, exp);
-}
-
-
-enum GNUNET_GenericReturnValue
-jwt_create_presentation (void *cls,
-                         const struct GNUNET_RECLAIM_Credential *cred,
-                         const struct GNUNET_RECLAIM_AttributeList *attrs,
-                         struct GNUNET_RECLAIM_Presentation **presentation)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
-    return GNUNET_NO;
-  *presentation = GNUNET_RECLAIM_presentation_new (
-    GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT,
-    cred->data,
-    cred->data_size);
-  return GNUNET_OK;
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_plugin_reclaim_credential_jwt_init (void *cls)
-{
-  struct GNUNET_RECLAIM_CredentialPluginFunctions *api;
-
-  api = GNUNET_new (struct GNUNET_RECLAIM_CredentialPluginFunctions);
-  api->value_to_string = &jwt_value_to_string;
-  api->string_to_value = &jwt_string_to_value;
-  api->typename_to_number = &jwt_typename_to_number;
-  api->number_to_typename = &jwt_number_to_typename;
-  api->get_attributes = &jwt_parse_attributes_c;
-  api->get_issuer = &jwt_get_issuer_c;
-  api->get_expiration = &jwt_get_expiration_c;
-  api->value_to_string_p = &jwt_value_to_string;
-  api->string_to_value_p = &jwt_string_to_value;
-  api->typename_to_number_p = &jwt_typename_to_number;
-  api->number_to_typename_p = &jwt_number_to_typename;
-  api->get_attributes_p = &jwt_parse_attributes_p;
-  api->get_issuer_p = &jwt_get_issuer_p;
-  api->get_expiration_p = &jwt_get_expiration_p;
-  api->create_presentation = &jwt_create_presentation;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_plugin_block_test_init()
- * @return NULL
- */
-void *
-libgnunet_plugin_reclaim_credential_jwt_done (void *cls)
-{
-  struct GNUNET_RECLAIM_CredentialPluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_reclaim_credential_type_jwt.c */
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c b/src/reclaim/plugin_reclaim_credential_pabc.c
deleted file mode 100644
index a906805fb..000000000
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2013, 2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/plugin_reclaim_credential_pabc.c
- * @brief reclaim-credential-plugin-pabc attribute plugin to provide the API for
- *                                      pabc credentials.
- *
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_plugin.h"
-#include <inttypes.h>
-#include <jansson.h>
-#include <pabc/pabc.h>
-#include "pabc_helper.h"
-
-/**
-   * Convert the 'value' of an credential to a string.
-   *
-   * @param cls closure, unused
-   * @param type type of the credential
-   * @param data value in binary encoding
-   * @param data_size number of bytes in @a data
-   * @return NULL on error, otherwise human-readable representation of the value
-   */
-static char *
-pabc_value_to_string (void *cls,
-                      uint32_t type,
-                      const void *data,
-                      size_t data_size)
-{
-  switch (type)
-  {
-  case GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC:
-    return GNUNET_strndup (data, data_size);
-
-  default:
-    return NULL;
-  }
-}
-
-
-/**
- * Convert human-readable version of a 'value' of an credential to the binary
- * representation.
- *
- * @param cls closure, unused
- * @param type type of the credential
- * @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
- */
-static int
-pabc_string_to_value (void *cls,
-                      uint32_t type,
-                      const char *s,
-                      void **data,
-                      size_t *data_size)
-{
-  if (NULL == s)
-    return GNUNET_SYSERR;
-  switch (type)
-  {
-  case GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC:
-    *data = GNUNET_strdup (s);
-    *data_size = strlen (s) + 1;
-    return GNUNET_OK;
-
-  default:
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Mapping of credential type numbers to human-readable
- * credential type names.
- */
-static struct
-{
-  const char *name;
-  uint32_t number;
-} pabc_cred_name_map[] = { { "PABC", GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC },
-                           { NULL, UINT32_MAX } };
-
-/**
-   * Convert a type name to the corresponding number.
-   *
-   * @param cls closure, unused
-   * @param pabc_typename name to convert
-   * @return corresponding number, UINT32_MAX on error
-   */
-static uint32_t
-pabc_typename_to_number (void *cls, const char *pabc_typename)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != pabc_cred_name_map[i].name) &&
-         (0 != strcasecmp (pabc_typename, pabc_cred_name_map[i].name)))
-    i++;
-  return pabc_cred_name_map[i].number;
-}
-
-
-/**
- * Convert a type number (i.e. 1) to the corresponding type string
- *
- * @param cls closure, unused
- * @param type number of a type to convert
- * @return corresponding typestring, NULL on error
- */
-static const char *
-pabc_number_to_typename (void *cls, uint32_t type)
-{
-  unsigned int i;
-
-  i = 0;
-  while ((NULL != pabc_cred_name_map[i].name) && (type !=
-                                                  pabc_cred_name_map[i].
-                                                  number))
-    i++;
-  return pabc_cred_name_map[i].name;
-}
-
-
-static void
-inspect_attrs (char const *const key,
-               char const *const value,
-               void *ctx)
-{
-  struct GNUNET_RECLAIM_AttributeList *attrs = ctx;
-
-  if (NULL == value)
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Found attribute in PABC credential: `%s': `%s'\n",
-              key, value);
-  if (0 == strcmp (key, "expiration"))
-    return;
-  if (0 == strcmp (key, "issuer"))
-    return;
-  if (0 == strcmp (key, "subject"))
-    return;
-  GNUNET_RECLAIM_attribute_list_add (attrs,
-                                     key,
-                                     NULL,
-                                     GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING,
-                                     value,
-                                     strlen (value));
-}
-
-
-/**
- * Parse a pabc and return the respective claim value as Attribute
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_AttributeList *
-pabc_parse_attributes (void *cls,
-                       const char *data,
-                       size_t data_size)
-{
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Collecting PABC attributes...\n");
-  attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  GNUNET_assert (PABC_OK ==
-                 pabc_cred_inspect_credential (data,
-                                               &inspect_attrs, attrs));
-  return attrs;
-}
-
-
-/**
- * Parse a pabc and return the respective claim value as Attribute
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_AttributeList *
-pabc_parse_attributes_c (void *cls,
-                         const struct GNUNET_RECLAIM_Credential *cred)
-{
-  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC)
-    return NULL;
-  return pabc_parse_attributes (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a pabc and return the respective claim value as Attribute
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_AttributeList *
-pabc_parse_attributes_p (void *cls,
-                         const struct GNUNET_RECLAIM_Presentation *cred)
-{
-  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC)
-    return NULL;
-  return pabc_parse_attributes (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a pabc and return the issuer
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-char*
-pabc_get_issuer (void *cls,
-                 const char *data,
-                 size_t data_size)
-{
-  char *res;
-  if (PABC_OK != pabc_cred_get_attr_by_name_from_cred (data,
-                                                       "issuer",
-                                                       &res))
-    return NULL;
-  return res;
-}
-
-
-/**
- * Parse a pabc and return the issuer
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-char *
-pabc_get_issuer_c (void *cls,
-                   const struct GNUNET_RECLAIM_Credential *cred)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC != cred->type)
-    return NULL;
-  return pabc_get_issuer (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a pabc and return the issuer
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-char *
-pabc_get_issuer_p (void *cls,
-                   const struct GNUNET_RECLAIM_Presentation *cred)
-{
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC != cred->type)
-    return NULL;
-  return pabc_get_issuer (cls, cred->data, cred->data_size);
-}
-
-
-/**
- * Parse a pabc and return the expiration
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-enum GNUNET_GenericReturnValue
-pabc_get_expiration (void *cls,
-                     const char *data,
-                     size_t data_size,
-                     struct GNUNET_TIME_Absolute *exp)
-{
-  char *exp_str;
-  uint64_t exp_i;
-
-  if (PABC_OK != pabc_cred_get_attr_by_name_from_cred (data,
-                                                       "expiration",
-                                                       &exp_str))
-    return GNUNET_SYSERR;
-
-  if (1 != sscanf (exp_str, "%llu", &exp_i))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Invalid expiration `%s'\n", exp_str);
-    GNUNET_free (exp_str);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Converted expiration string `%s' to %llu",
-              exp_str, exp_i);
-
-  GNUNET_free (exp_str);
-  exp->abs_value_us = exp_i * 1000 * 1000;
-  return GNUNET_OK;
-}
-
-
-/**
- * Parse a pabc and return the expiration
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-enum GNUNET_GenericReturnValue
-pabc_get_expiration_c (void *cls,
-                       const struct GNUNET_RECLAIM_Credential *cred,
-                       struct GNUNET_TIME_Absolute *exp)
-{
-  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC)
-    return GNUNET_NO;
-  return pabc_get_expiration (cls, cred->data, cred->data_size, exp);
-}
-
-
-/**
- * Parse a pabc and return the expiration
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-enum GNUNET_GenericReturnValue
-pabc_get_expiration_p (void *cls,
-                       const struct GNUNET_RECLAIM_Presentation *cred,
-                       struct GNUNET_TIME_Absolute *exp)
-{
-  if (cred->type != GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC)
-    return GNUNET_NO;
-  return pabc_get_expiration (cls, cred->data, cred->data_size, exp);
-}
-
-
-int
-pabc_create_presentation (void *cls,
-                          const struct GNUNET_RECLAIM_Credential *credential,
-                          const struct GNUNET_RECLAIM_AttributeList *attrs,
-                          struct GNUNET_RECLAIM_Presentation **presentation)
-{
-  struct pabc_context *ctx = NULL;
-  struct pabc_user_context *usr_ctx = NULL;
-  struct pabc_public_parameters *pp = NULL;
-  struct pabc_credential *cred = NULL;
-  struct pabc_blinded_proof *proof = NULL;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  char *issuer;
-  char *subject;
-  enum pabc_status status;
-
-  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC != credential->type)
-    return GNUNET_NO;
-
-
-  PABC_ASSERT (pabc_new_ctx (&ctx));
-  issuer = pabc_get_issuer_c (cls, credential);
-  if (NULL == issuer)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No issuer found in credential\n");
-    pabc_free_ctx (&ctx);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Got issuer for credential: %s\n", issuer);
-  status = PABC_load_public_parameters (ctx, issuer, &pp);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read public parameters.\n");
-    pabc_free_ctx (&ctx);
-    GNUNET_free (issuer);
-    return GNUNET_SYSERR;
-  }
-  if (PABC_OK != pabc_cred_get_attr_by_name_from_cred (credential->data,
-                                                       "subject",
-                                                       &subject))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to get subject.\n");
-    pabc_free_ctx (&ctx);
-    GNUNET_free (issuer);
-    return GNUNET_SYSERR;
-  }
-  status = PABC_read_usr_ctx (subject, issuer, ctx, pp, &usr_ctx);
-  GNUNET_free (issuer);
-  GNUNET_free (subject);
-  if (PABC_OK != status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read user context.\n");
-    pabc_free_public_parameters (ctx, &pp);
-    return GNUNET_SYSERR;
-  }
-
-  status = pabc_new_credential (ctx, pp, &cred);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to allocate credential.\n");
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    return GNUNET_SYSERR;
-  }
-
-  status = pabc_decode_credential (ctx, pp, cred, credential->data);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to decode credential.\n");
-    pabc_free_credential (ctx, pp, &cred);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    return GNUNET_SYSERR;
-  }
-
-  status = pabc_new_proof (ctx, pp, &proof);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to allocate proof.\n");
-    pabc_free_credential (ctx, pp, &cred);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    return GNUNET_SYSERR;
-  }
-
-  // now we can parse the attributes to disclose and configure the proof
-  for (ale = attrs->list_head; NULL != ale; ale = ale->next)
-  {
-    status = pabc_set_disclosure_by_attribute_name (ctx, pp, proof,
-                                                    ale->attribute->name,
-                                                    PABC_DISCLOSED, cred);
-    if (status != PABC_OK)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to configure proof.\n");
-      pabc_free_credential (ctx, pp, &cred);
-      pabc_free_user_context (ctx, pp, &usr_ctx);
-      pabc_free_public_parameters (ctx, &pp);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  // and finally -> sign the proof
-  status = pabc_gen_proof (ctx, usr_ctx, pp, proof, cred);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to sign proof.\n");
-    pabc_free_proof (ctx, pp, &proof);
-    pabc_free_credential (ctx, pp, &cred);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    return GNUNET_SYSERR;
-  }
-  // print the result
-  char *json = NULL;
-  char *ppid = NULL;
-  char *userid = NULL;
-  GNUNET_assert (PABC_OK == pabc_cred_get_userid_from_cred (credential->data,
-                                                            &userid));
-  GNUNET_assert (PABC_OK == pabc_cred_get_ppid_from_cred (credential->data,
-                                                          &ppid));
-  pabc_cred_encode_proof (ctx, pp, proof, userid, ppid,  &json);
-  GNUNET_free (ppid);
-  GNUNET_free (userid);
-  if (PABC_OK != status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to serialize proof.\n");
-    pabc_free_proof (ctx, pp, &proof);
-    pabc_free_credential (ctx, pp, &cred);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    return GNUNET_SYSERR;
-  }
-  char *json_enc;
-  GNUNET_STRINGS_base64_encode (json,
-                                strlen (json) + 1,
-                                &json_enc);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Presentation: %s\n", json_enc);
-  // clean up
-  *presentation = GNUNET_RECLAIM_presentation_new (
-    GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC,
-    json_enc,
-    strlen (json_enc) + 1);
-  GNUNET_free (json_enc);
-  PABC_FREE_NULL (json);
-  pabc_free_proof (ctx, pp, &proof);
-  pabc_free_credential (ctx, pp, &cred);
-  pabc_free_user_context (ctx, pp, &usr_ctx);
-  pabc_free_public_parameters (ctx, &pp);
-  return GNUNET_OK;
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_plugin_reclaim_credential_pabc_init (void *cls)
-{
-  struct GNUNET_RECLAIM_CredentialPluginFunctions *api;
-
-  api = GNUNET_new (struct GNUNET_RECLAIM_CredentialPluginFunctions);
-  api->value_to_string = &pabc_value_to_string;
-  api->string_to_value = &pabc_string_to_value;
-  api->typename_to_number = &pabc_typename_to_number;
-  api->number_to_typename = &pabc_number_to_typename;
-  api->get_attributes = &pabc_parse_attributes_c;
-  api->get_issuer = &pabc_get_issuer_c;
-  api->get_expiration = &pabc_get_expiration_c;
-  api->value_to_string_p = &pabc_value_to_string;
-  api->string_to_value_p = &pabc_string_to_value;
-  api->typename_to_number_p = &pabc_typename_to_number;
-  api->number_to_typename_p = &pabc_number_to_typename;
-  api->get_attributes_p = &pabc_parse_attributes_p;
-  api->get_issuer_p = &pabc_get_issuer_p;
-  api->get_expiration_p = &pabc_get_expiration_p;
-  api->create_presentation = &pabc_create_presentation;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_plugin_block_test_init()
- * @return NULL
- */
-void *
-libgnunet_plugin_reclaim_credential_pabc_done (void *cls)
-{
-  struct GNUNET_RECLAIM_CredentialPluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_reclaim_credential_type_pabc.c */
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
deleted file mode 100644
index d0aee043e..000000000
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ /dev/null
@@ -1,3162 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2018 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @author Philippe Buschmann
- * @author Tristan Schwieren
- * @file identity/plugin_rest_openid_connect.c
- * @brief GNUnet Namestore REST plugin
- *
- */
-#include "platform.h"
-#include <inttypes.h>
-#include <jansson.h>
-#include <jose/jose.h>
-
-#include "gnunet_util_lib.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_rest_lib.h"
-#include "gnunet_rest_plugin.h"
-#include "gnunet_signatures.h"
-#include "microhttpd.h"
-#include "oidc_helper.h"
-
-/**
- * REST root namespace
- */
-#define GNUNET_REST_API_NS_OIDC "/openid"
-
-/**
- * OIDC config
- */
-#define GNUNET_REST_API_NS_OIDC_CONFIG "/.well-known/openid-configuration"
-
-/**
- * Authorize endpoint
- */
-#define GNUNET_REST_API_NS_AUTHORIZE "/openid/authorize"
-
-/**
- * Token endpoint
- */
-#define GNUNET_REST_API_NS_TOKEN "/openid/token"
-
-/**
- * JSON Web Keys endpoint
- */
-#define GNUNET_REST_API_JWKS "/jwks.json"
-
-/**
- * UserInfo endpoint
- */
-#define GNUNET_REST_API_NS_USERINFO "/openid/userinfo"
-
-/**
- * Login namespace
- */
-#define GNUNET_REST_API_NS_LOGIN "/openid/login"
-
-/**
- * State while collecting all egos
- */
-#define ID_REST_STATE_INIT 0
-
-/**
- * Done collecting egos
- */
-#define ID_REST_STATE_POST_INIT 1
-
-/**
- * OIDC grant_type key
- */
-#define OIDC_GRANT_TYPE_KEY "grant_type"
-
-/**
- * OIDC grant_type key
- */
-#define OIDC_GRANT_TYPE_VALUE "authorization_code"
-
-/**
- * OIDC code key
- */
-#define OIDC_CODE_KEY "code"
-
-/**
- * OIDC response_type key
- */
-#define OIDC_RESPONSE_TYPE_KEY "response_type"
-
-/**
- * OIDC client_id key
- */
-#define OIDC_CLIENT_ID_KEY "client_id"
-
-/**
- * OIDC scope key
- */
-#define OIDC_SCOPE_KEY "scope"
-
-/**
- * OIDC redirect_uri key
- */
-#define OIDC_REDIRECT_URI_KEY "redirect_uri"
-
-/**
- * OIDC state key
- */
-#define OIDC_STATE_KEY "state"
-
-/**
- * OIDC nonce key
- */
-#define OIDC_NONCE_KEY "nonce"
-
-/**
- * OIDC claims key
- */
-#define OIDC_CLAIMS_KEY "claims"
-
-/**
- * OIDC PKCE code challenge
- */
-#define OIDC_CODE_CHALLENGE_KEY "code_challenge"
-
-/**
- * OIDC PKCE code verifier
- */
-#define OIDC_CODE_VERIFIER_KEY "code_verifier"
-
-/**
- * OIDC cookie expiration (in seconds)
- */
-#define OIDC_COOKIE_EXPIRATION 3
-
-/**
- * OIDC cookie header key
- */
-#define OIDC_COOKIE_HEADER_KEY "cookie"
-
-/**
- * OIDC cookie header information key
- */
-#define OIDC_AUTHORIZATION_HEADER_KEY "authorization"
-
-/**
- * OIDC cookie header information key
- */
-#define OIDC_COOKIE_HEADER_INFORMATION_KEY "Identity="
-
-/**
- * OIDC cookie header if user cancelled
- */
-#define OIDC_COOKIE_HEADER_ACCESS_DENIED "Identity=Denied"
-
-/**
- * OIDC expected response_type while authorizing
- */
-#define OIDC_EXPECTED_AUTHORIZATION_RESPONSE_TYPE "code"
-
-/**
- * OIDC expected scope part while authorizing
- */
-#define OIDC_EXPECTED_AUTHORIZATION_SCOPE "openid"
-
-/**
- * OIDC error key for invalid client
- */
-#define OIDC_ERROR_KEY_INVALID_CLIENT "invalid_client"
-
-/**
- * OIDC error key for invalid scopes
- */
-#define OIDC_ERROR_KEY_INVALID_SCOPE "invalid_scope"
-
-/**
- * OIDC error key for invalid requests
- */
-#define OIDC_ERROR_KEY_INVALID_REQUEST "invalid_request"
-
-/**
- * OIDC error key for invalid tokens
- */
-#define OIDC_ERROR_KEY_INVALID_TOKEN "invalid_token"
-
-/**
- * OIDC error key for invalid cookies
- */
-#define OIDC_ERROR_KEY_INVALID_COOKIE "invalid_cookie"
-
-/**
- * OIDC error key for generic server errors
- */
-#define OIDC_ERROR_KEY_SERVER_ERROR "server_error"
-
-/**
- * OIDC error key for unsupported grants
- */
-#define OIDC_ERROR_KEY_UNSUPPORTED_GRANT_TYPE "unsupported_grant_type"
-
-/**
- * OIDC error key for unsupported response types
- */
-#define OIDC_ERROR_KEY_UNSUPPORTED_RESPONSE_TYPE "unsupported_response_type"
-
-/**
- * OIDC error key for unauthorized clients
- */
-#define OIDC_ERROR_KEY_UNAUTHORIZED_CLIENT "unauthorized_client"
-
-/**
- * OIDC error key for denied access
- */
-#define OIDC_ERROR_KEY_ACCESS_DENIED "access_denied"
-
-/**
- * OIDC key store file name
- */
-#define OIDC_JWK_RSA_FILENAME "jwk_rsa.json"
-
-/**
- * How long to wait for a consume in userinfo endpoint
- */
-#define CONSUME_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS,2)
-
-/**
- * OIDC ignored parameter array
- */
-static char *OIDC_ignored_parameter_array[] = { "display",
-                                                "prompt",
-                                                "ui_locales",
-                                                "response_mode",
-                                                "id_token_hint",
-                                                "login_hint",
-                                                "acr_values" };
-
-/**
- * OIDC hashmap for cached access tokens and codes
- */
-struct GNUNET_CONTAINER_MultiHashMap *oidc_code_cache;
-
-/**
- * OIDC hashmap that keeps track of issued cookies
- */
-struct GNUNET_CONTAINER_MultiHashMap *OIDC_cookie_jar_map;
-
-/**
- * The configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * HTTP methods allows for this plugin
- */
-static char *allow_methods;
-
-/**
- * Ego list
- */
-static struct EgoEntry *ego_head;
-
-/**
- * Ego list
- */
-static struct EgoEntry *ego_tail;
-
-/**
- * The processing state
- */
-static int state;
-
-/**
- * Handle to Identity service.
-  */
-static struct GNUNET_IDENTITY_Handle *identity_handle;
-
-/**
- * GNS handle
- */
-static struct GNUNET_GNS_Handle *gns_handle;
-
-/**
- * Identity Provider
- */
-static struct GNUNET_RECLAIM_Handle *idp;
-
-/**
- * Timeout for consume call on userinfo
- */
-static struct GNUNET_TIME_Relative consume_timeout;
-
-/**
- * @brief struct returned by the initialization function of the plugin
- */
-struct Plugin
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-/**
- * @brief The RSA key used by the oidc enpoint
- */
-json_t *oidc_jwk;
-
-/**
- * OIDC needed variables
- */
-struct OIDC_Variables
-{
-  /**
-   * The RP client public key
-   */
-  struct GNUNET_CRYPTO_PublicKey client_pkey;
-
-  /**
-   * The OIDC client id of the RP
-   */
-  char *client_id;
-
-  /**
-   * The OIDC redirect uri
-   */
-  char *redirect_uri;
-
-  /**
-   * The list of oidc scopes
-   */
-  char *scope;
-
-  /**
-   * The OIDC state
-   */
-  char *state;
-
-  /**
-   * The OIDC nonce
-   */
-  char *nonce;
-
-  /**
-   * The OIDC claims
-   */
-  char *claims;
-
-  /**
-   * The OIDC response type
-   */
-  char *response_type;
-
-  /**
-   * The identity chosen by the user to login
-   */
-  char *login_identity;
-
-  /**
-   * User cancelled authorization/login
-   */
-  int user_cancelled;
-
-  /**
-   * The PKCE code_challenge
-   */
-  char *code_challenge;
-
-  /**
-   * The PKCE code_verifier
-   */
-  char *code_verifier;
-
-};
-
-/**
- * The ego list
- */
-struct EgoEntry
-{
-  /**
-   * DLL
-   */
-  struct EgoEntry *next;
-
-  /**
-   * DLL
-   */
-  struct EgoEntry *prev;
-
-  /**
-   * Ego Identifier
-   */
-  char *identifier;
-
-  /**
-   * Public key string
-   */
-  char *keystring;
-
-  /**
-   * The Ego
-   */
-  struct GNUNET_IDENTITY_Ego *ego;
-};
-
-
-struct RequestHandle
-{
-  /**
-   * DLL
-   */
-  struct RequestHandle *next;
-
-  /**
-   * DLL
-   */
-  struct RequestHandle *prev;
-
-  /**
-   * Selected ego
-   */
-  struct EgoEntry *ego_entry;
-
-  /**
-   * Pointer to ego private key
-   */
-  struct GNUNET_CRYPTO_PrivateKey priv_key;
-
-  /**
-   * OIDC variables
-   */
-  struct OIDC_Variables *oidc;
-
-  /**
-   * GNS lookup op
-   */
-  struct GNUNET_GNS_LookupRequest *gns_op;
-
-  /**
-   * Rest connection
-   */
-  struct GNUNET_REST_RequestHandle *rest_handle;
-
-  /**
-   * Attribute claim list for id_token
-   */
-  struct GNUNET_RECLAIM_AttributeList *attr_idtoken_list;
-
-  /**
-   * Attribute claim list for userinfo
-   */
-  struct GNUNET_RECLAIM_AttributeList *attr_userinfo_list;
-
-  /**
-   * Credentials
-   */
-  struct GNUNET_RECLAIM_CredentialList *credentials;
-
-  /**
-   * Presentations
-   */
-  struct GNUNET_RECLAIM_PresentationList *presentations;
-
-  /**
-   * IDENTITY Operation
-   */
-  struct GNUNET_IDENTITY_Operation *op;
-
-
-  /**
-   * Idp Operation
-   */
-  struct GNUNET_RECLAIM_Operation *idp_op;
-
-  /**
-   * Timeout task for consume
-   */
-  struct GNUNET_SCHEDULER_Task *consume_timeout_op;
-
-  /**
-   * Attribute iterator
-   */
-  struct GNUNET_RECLAIM_AttributeIterator *attr_it;
-
-  /**
-   * Credential iterator
-   */
-  struct GNUNET_RECLAIM_CredentialIterator *cred_it;
-
-
-  /**
-   * Ticket iterator
-   */
-  struct GNUNET_RECLAIM_TicketIterator *ticket_it;
-
-  /**
-   * A ticket
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-
-  /**
-   * Desired timeout for the lookup (default is no timeout).
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * ID of a task associated with the resolution process.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * The plugin result processor
-   */
-  GNUNET_REST_ResultProcessor proc;
-
-  /**
-   * The closure of the result processor
-   */
-  void *proc_cls;
-
-  /**
-   * The url
-   */
-  char *url;
-
-  /**
-   * The passed access token
-   */
-  char *access_token;
-
-  /**
-   * The tld for redirect
-   */
-  char *tld;
-
-  /**
-   * The redirect prefix
-   */
-  char *redirect_prefix;
-
-  /**
-   * The redirect suffix
-   */
-  char *redirect_suffix;
-
-  /**
-   * Error response message
-   */
-  char *emsg;
-
-  /**
-   * Error response description
-   */
-  char *edesc;
-
-  /**
-   * Response code
-   */
-  int response_code;
-
-  /**
-   * Public client
-   */
-  int public_client;
-};
-
-/**
- * DLL
- */
-static struct RequestHandle *requests_head;
-
-/**
- * DLL
- */
-static struct RequestHandle *requests_tail;
-
-
-/**
- * Cleanup lookup handle
- * @param handle Handle to clean up
- */
-static void
-cleanup_handle (struct RequestHandle *handle)
-{
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
-  if (NULL != handle->timeout_task)
-    GNUNET_SCHEDULER_cancel (handle->timeout_task);
-  if (NULL != handle->attr_it)
-    GNUNET_RECLAIM_get_attributes_stop (handle->attr_it);
-  if (NULL != handle->cred_it)
-    GNUNET_RECLAIM_get_credentials_stop (handle->cred_it);
-  if (NULL != handle->ticket_it)
-    GNUNET_RECLAIM_ticket_iteration_stop (handle->ticket_it);
-  if (NULL != handle->idp_op)
-    GNUNET_RECLAIM_cancel (handle->idp_op);
-  if (NULL != handle->consume_timeout_op)
-    GNUNET_SCHEDULER_cancel (handle->consume_timeout_op);
-  GNUNET_free (handle->url);
-  GNUNET_free (handle->tld);
-  GNUNET_free (handle->redirect_prefix);
-  GNUNET_free (handle->redirect_suffix);
-  GNUNET_free (handle->emsg);
-  GNUNET_free (handle->edesc);
-  if (NULL != handle->gns_op)
-    GNUNET_GNS_lookup_cancel (handle->gns_op);
-  if (NULL != handle->oidc)
-  {
-    GNUNET_free (handle->oidc->client_id);
-    GNUNET_free (handle->oidc->login_identity);
-    GNUNET_free (handle->oidc->nonce);
-    GNUNET_free (handle->oidc->redirect_uri);
-    GNUNET_free (handle->oidc->response_type);
-    GNUNET_free (handle->oidc->scope);
-    GNUNET_free (handle->oidc->state);
-    if (NULL != handle->oidc->claims)
-      GNUNET_free (handle->oidc->claims);
-    if (NULL != handle->oidc->code_challenge)
-      GNUNET_free (handle->oidc->code_challenge);
-    GNUNET_free (handle->oidc);
-  }
-  if (NULL!=handle->attr_idtoken_list)
-    GNUNET_RECLAIM_attribute_list_destroy (handle->attr_idtoken_list);
-  if (NULL!=handle->attr_userinfo_list)
-    GNUNET_RECLAIM_attribute_list_destroy (handle->attr_userinfo_list);
-  if (NULL!=handle->credentials)
-    GNUNET_RECLAIM_credential_list_destroy (handle->credentials);
-  if (NULL!=handle->presentations)
-    GNUNET_RECLAIM_presentation_list_destroy (handle->presentations);
-  GNUNET_CONTAINER_DLL_remove (requests_head,
-                               requests_tail,
-                               handle);
-  if (NULL != handle->access_token)
-    GNUNET_free (handle->access_token);
-  GNUNET_free (handle);
-}
-
-
-/**
- * Task run on error, sends error message.  Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_error (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *json_error;
-
-  GNUNET_asprintf (&json_error,
-                   "{ \"error\" : \"%s\", \"error_description\" : \"%s\"%s%s%s}",
-                   handle->emsg,
-                   (NULL != handle->edesc) ? handle->edesc : "",
-                   (NULL != handle->oidc->state) ? ", \"state\":\"" : "",
-                   (NULL != handle->oidc->state) ? handle->oidc->state : "",
-                   (NULL != handle->oidc->state) ? "\"" : "");
-  if (0 == handle->response_code)
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-  resp = GNUNET_REST_create_response (json_error);
-  if (MHD_HTTP_UNAUTHORIZED == handle->response_code)
-    GNUNET_assert (MHD_NO !=
-                   MHD_add_response_header (resp,
-                                            MHD_HTTP_HEADER_WWW_AUTHENTICATE,
-                                            "Basic"));
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    MHD_HTTP_HEADER_CONTENT_TYPE,
-                                                    "application/json"));
-  handle->proc (handle->proc_cls, resp, handle->response_code);
-  cleanup_handle (handle);
-  GNUNET_free (json_error);
-}
-
-
-/**
- * Task run on error in userinfo endpoint, sends error header. Cleans up
- * everything
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_userinfo_error (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *error;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Error: %s\n", handle->edesc);
-  GNUNET_asprintf (&error,
-                   "error=\"%s\", error_description=\"%s\"",
-                   handle->emsg,
-                   (NULL != handle->edesc) ? handle->edesc : "");
-  resp = GNUNET_REST_create_response ("");
-  GNUNET_assert (MHD_NO !=
-                 MHD_add_response_header (resp,
-                                          MHD_HTTP_HEADER_WWW_AUTHENTICATE,
-                                          "Bearer"));
-  handle->proc (handle->proc_cls, resp, handle->response_code);
-  cleanup_handle (handle);
-  GNUNET_free (error);
-}
-
-
-/**
- * Task run on error, sends error message and redirects. Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_redirect_error (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *redirect;
-
-  GNUNET_asprintf (&redirect,
-                   "%s?error=%s&error_description=%s%s%s",
-                   handle->oidc->redirect_uri,
-                   handle->emsg,
-                   handle->edesc,
-                   (NULL != handle->oidc->state) ? "&state=" : "",
-                   (NULL != handle->oidc->state) ? handle->oidc->state : "");
-  resp = GNUNET_REST_create_response ("");
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Location", redirect));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_FOUND);
-  cleanup_handle (handle);
-  GNUNET_free (redirect);
-}
-
-
-/**
- * Task run on timeout, sends error message.  Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_timeout (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  handle->timeout_task = NULL;
-  do_error (handle);
-}
-
-
-/**
- * Respond to OPTIONS request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-options_cont (struct GNUNET_REST_RequestHandle *con_handle,
-              const char *url,
-              void *cls)
-{
-  struct MHD_Response *resp;
-  struct RequestHandle *handle = cls;
-
-  // For now, independent of path return all options
-  resp = GNUNET_REST_create_response (NULL);
-  MHD_add_response_header (resp, "Access-Control-Allow-Methods", allow_methods);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  cleanup_handle (handle);
-  return;
-}
-
-
-/**
- * Interprets cookie header and pass its identity keystring to handle
- */
-static void
-cookie_identity_interpretation (struct RequestHandle *handle)
-{
-  struct GNUNET_HashCode cache_key;
-  char *cookies;
-  struct GNUNET_TIME_Absolute current_time, *relog_time;
-  char delimiter[] = "; ";
-  char *tmp_cookies;
-  char *token;
-  char *value;
-
-  // gets identity of login try with cookie
-  GNUNET_CRYPTO_hash (OIDC_COOKIE_HEADER_KEY,
-                      strlen (OIDC_COOKIE_HEADER_KEY),
-                      &cache_key);
-  if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                           ->header_param_map,
-                                                           &cache_key))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No cookie found\n");
-    return;
-  }
-  // splits cookies and find 'Identity' cookie
-  tmp_cookies =
-    GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->header_param_map,
-                                       &cache_key);
-  cookies = GNUNET_strdup (tmp_cookies);
-  token = strtok (cookies, delimiter);
-  handle->oidc->user_cancelled = GNUNET_NO;
-  handle->oidc->login_identity = NULL;
-  if (NULL == token)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse cookie: %s\n",
-                cookies);
-    GNUNET_free (cookies);
-    return;
-  }
-
-  while (NULL != token)
-  {
-    if (0 == strcmp (token, OIDC_COOKIE_HEADER_ACCESS_DENIED))
-    {
-      handle->oidc->user_cancelled = GNUNET_YES;
-      GNUNET_free (cookies);
-      return;
-    }
-    if (NULL != strstr (token, OIDC_COOKIE_HEADER_INFORMATION_KEY))
-      break;
-    token = strtok (NULL, delimiter);
-  }
-  if (NULL == token)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No cookie value to process: %s\n",
-                cookies);
-    GNUNET_free (cookies);
-    return;
-  }
-  GNUNET_CRYPTO_hash (token, strlen (token), &cache_key);
-  if (GNUNET_NO ==
-      GNUNET_CONTAINER_multihashmap_contains (OIDC_cookie_jar_map, &cache_key))
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_WARNING,
-      "Found cookie `%s', but no corresponding expiration entry present...\n",
-      token);
-    GNUNET_free (cookies);
-    return;
-  }
-  relog_time =
-    GNUNET_CONTAINER_multihashmap_get (OIDC_cookie_jar_map, &cache_key);
-  current_time = GNUNET_TIME_absolute_get ();
-  // 30 min after old login -> redirect to login
-  if (current_time.abs_value_us > relog_time->abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Found cookie `%s', but it is expired.\n",
-                token);
-    GNUNET_free (cookies);
-    return;
-  }
-  value = strtok (token, OIDC_COOKIE_HEADER_INFORMATION_KEY);
-  GNUNET_assert (NULL != value);
-  handle->oidc->login_identity = GNUNET_strdup (value);
-  GNUNET_free (cookies);
-}
-
-
-/**
- * @brief Read the the JSON Web Key in the given file and return it.
- * Return NULL and emit warning if JSON can not be decoded or the key is
- * invalid
- *
- * @param filename the file to read the JWK from
- * @return json_t* the reed JWK
- */
-json_t *
-read_jwk_from_file (const char *filename)
-{
-  json_t *jwk;
-  json_error_t error;
-
-  jwk = json_load_file (filename, JSON_DECODE_ANY, &error);
-
-  if (! jwk)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                ("Could not read OIDC RSA key from config file; %s\n"),
-                error.text);
-  }
-
-  return jwk;
-}
-
-/**
- * @brief Write the JWK to file. If unsuccessful emit warning
- *
- * @param filename the name of the file the JWK is writen to
- * @param jwk the JWK that is going to be written
- * @return int Return GNUNET_OK if write is sucessfull
- */
-static int
-write_jwk_to_file (const char *filename,
-                   json_t *jwk)
-{
-  if (json_dump_file (jwk, filename, JSON_INDENT (2)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                ("Could not write OIDC RSA key to file %s\n"),
-                filename);
-    return GNUNET_ERROR_TYPE_WARNING;
-  }
-  else
-    return GNUNET_OK;
-}
-
-/**
- * @brief Generate a new RSA JSON Web Key
- *
- * @return json_t* the generated JWK
- */
-json_t *
-generate_jwk ()
-{
-  json_t *jwk;
-  jwk = json_pack ("{s:s,s:i}", "kty", "RSA", "bits", 2048);
-  jose_jwk_gen (NULL, jwk);
-  json_incref (jwk);
-  return jwk;
-}
-
-/**
- * Return the path to the oidc directory path
- *
- * @param cls the RequestHandle
- */
-char *
-get_oidc_dir_path (void *cls)
-{
-  char *oidc_directory;
-  struct RequestHandle *handle = cls;
-
-  // Read OIDC directory from config
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                            "reclaim-rest-plugin",
-                                                            "oidc_dir",
-                                                            &oidc_directory))
-  {
-    // Could not read Config file
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-    handle->edesc = GNUNET_strdup ("gnunet configuration failed");
-    handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return NULL;
-  }
-
-  return oidc_directory;
-}
-
-/**
- * Return the path to the RSA JWK key file
- *
- * @param cls the RequestHandle
- */
-char *
-get_oidc_jwk_path (void *cls)
-{
-  char *oidc_directory;
-  char *oidc_jwk_path;
-
-  oidc_directory = get_oidc_dir_path (cls);
-
-  // Create path to file
-  GNUNET_asprintf (&oidc_jwk_path, "%s/%s", oidc_directory,
-                   OIDC_JWK_RSA_FILENAME);
-
-  return oidc_jwk_path;
-}
-
-
-/**
- * Redirects to login page stored in configuration file
- */
-static void
-login_redirect (void *cls)
-{
-  char *login_base_url;
-  char *new_redirect;
-  char *tmp;
-  struct MHD_Response *resp;
-  struct GNUNET_Buffer buf = { 0 };
-  struct RequestHandle *handle = cls;
-
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                          "reclaim-rest-plugin",
-                                                          "address",
-                                                          &login_base_url))
-  {
-    GNUNET_buffer_write_str (&buf, login_base_url);
-    GNUNET_buffer_write_fstr (&buf,
-                              "?%s=%s",
-                              OIDC_RESPONSE_TYPE_KEY,
-                              handle->oidc->response_type);
-    GNUNET_buffer_write_fstr (&buf,
-                              "&%s=%s",
-                              OIDC_CLIENT_ID_KEY,
-                              handle->oidc->client_id);
-    GNUNET_STRINGS_urlencode (handle->oidc->redirect_uri,
-                              strlen (handle->oidc->redirect_uri),
-                              &tmp);
-    GNUNET_buffer_write_fstr (&buf,
-                              "&%s=%s",
-                              OIDC_REDIRECT_URI_KEY,
-                              tmp);
-    GNUNET_free (tmp);
-    GNUNET_STRINGS_urlencode (handle->oidc->scope,
-                              strlen (handle->oidc->scope),
-                              &tmp);
-    GNUNET_buffer_write_fstr (&buf,
-                              "&%s=%s",
-                              OIDC_SCOPE_KEY,
-                              tmp);
-    GNUNET_free (tmp);
-    if (NULL != handle->oidc->state)
-    {
-      GNUNET_STRINGS_urlencode (handle->oidc->state,
-                                strlen (handle->oidc->state),
-                                &tmp);
-      GNUNET_buffer_write_fstr (&buf,
-                                "&%s=%s",
-                                OIDC_STATE_KEY,
-                                handle->oidc->state);
-      GNUNET_free (tmp);
-    }
-    if (NULL != handle->oidc->code_challenge)
-    {
-      GNUNET_buffer_write_fstr (&buf,
-                                "&%s=%s",
-                                OIDC_CODE_CHALLENGE_KEY,
-                                handle->oidc->code_challenge);
-    }
-    if (NULL != handle->oidc->nonce)
-    {
-      GNUNET_buffer_write_fstr (&buf,
-                                "&%s=%s",
-                                OIDC_NONCE_KEY,
-                                handle->oidc->nonce);
-    }
-    if (NULL != handle->oidc->claims)
-    {
-      GNUNET_STRINGS_urlencode (handle->oidc->claims,
-                                strlen (handle->oidc->claims),
-                                &tmp);
-      GNUNET_buffer_write_fstr (&buf,
-                                "&%s=%s",
-                                OIDC_CLAIMS_KEY,
-                                tmp);
-      GNUNET_free (tmp);
-    }
-    new_redirect = GNUNET_buffer_reap_str (&buf);
-    resp = GNUNET_REST_create_response ("");
-    MHD_add_response_header (resp, "Location", new_redirect);
-    GNUNET_free (login_base_url);
-  }
-  else
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-    handle->edesc = GNUNET_strdup ("gnunet configuration failed");
-    handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_FOUND);
-  GNUNET_free (new_redirect);
-  cleanup_handle (handle);
-}
-
-
-/**
- * Does internal server error when iteration failed.
- */
-static void
-oidc_iteration_error (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-  handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-  GNUNET_SCHEDULER_add_now (&do_error, handle);
-}
-
-
-/**
- * Issues ticket and redirects to relying party with the authorization code as
- * parameter. Otherwise redirects with error
- */
-static void
-oidc_ticket_issue_cb (void *cls,
-                      const struct GNUNET_RECLAIM_Ticket *ticket,
-                      const struct
-                      GNUNET_RECLAIM_PresentationList *presentation)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *ticket_str;
-  char *redirect_uri;
-  char *code_string;
-
-  handle->idp_op = NULL;
-  if (NULL == ticket)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-    handle->edesc = GNUNET_strdup ("Server cannot generate ticket.");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    return;
-  }
-  handle->ticket = *ticket;
-  ticket_str =
-    GNUNET_STRINGS_data_to_string_alloc (&handle->ticket,
-                                         sizeof(struct GNUNET_RECLAIM_Ticket));
-  code_string = OIDC_build_authz_code (&handle->priv_key,
-                                       &handle->ticket,
-                                       handle->attr_idtoken_list,
-                                       presentation,
-                                       handle->oidc->nonce,
-                                       handle->oidc->code_challenge);
-  if ((NULL != handle->redirect_prefix) && (NULL != handle->redirect_suffix) &&
-      (NULL != handle->tld))
-  {
-    GNUNET_asprintf (&redirect_uri,
-                     "%s.%s/%s%s%s=%s&state=%s",
-                     handle->redirect_prefix,
-                     handle->tld,
-                     handle->redirect_suffix,
-                     (NULL == strchr (handle->redirect_suffix, '?') ? "?" :
-                      "&"),
-                     handle->oidc->response_type,
-                     code_string,
-                     handle->oidc->state);
-  }
-  else
-  {
-    GNUNET_asprintf (&redirect_uri,
-                     "%s%s%s=%s&state=%s",
-                     handle->oidc->redirect_uri,
-                     (NULL == strchr (handle->oidc->redirect_uri, '?') ? "?" :
-                      "&"),
-                     handle->oidc->response_type,
-                     code_string,
-                     handle->oidc->state);
-  }
-  resp = GNUNET_REST_create_response ("");
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Location", redirect_uri));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_FOUND);
-  cleanup_handle (handle);
-  GNUNET_free (redirect_uri);
-  GNUNET_free (ticket_str);
-  GNUNET_free (code_string);
-}
-
-
-static struct GNUNET_RECLAIM_AttributeList*
-attribute_list_merge (struct GNUNET_RECLAIM_AttributeList *list_a,
-                      struct GNUNET_RECLAIM_AttributeList *list_b)
-{
-  struct GNUNET_RECLAIM_AttributeList *merged_list;
-  struct GNUNET_RECLAIM_AttributeListEntry *le_a;
-  struct GNUNET_RECLAIM_AttributeListEntry *le_b;
-  struct GNUNET_RECLAIM_AttributeListEntry *le_m;
-
-  merged_list = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  for (le_a = list_a->list_head; NULL != le_a; le_a = le_a->next)
-  {
-    le_m = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    le_m->attribute = GNUNET_RECLAIM_attribute_new (le_a->attribute->name,
-                                                    &le_a->attribute->
-                                                    credential,
-                                                    le_a->attribute->type,
-                                                    le_a->attribute->data,
-                                                    le_a->attribute->data_size);
-    le_m->attribute->id = le_a->attribute->id;
-    le_m->attribute->flag = le_a->attribute->flag;
-    le_m->attribute->credential = le_a->attribute->credential;
-    GNUNET_CONTAINER_DLL_insert (merged_list->list_head,
-                                 merged_list->list_tail,
-                                 le_m);
-  }
-  le_m = NULL;
-  for (le_b = list_b->list_head; NULL != le_b; le_b = le_b->next)
-  {
-    for (le_m = merged_list->list_head; NULL != le_m; le_m = le_m->next)
-    {
-      if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (&le_m->attribute->id,
-                                                    &le_b->attribute->id))
-        break; /** Attribute already in list **/
-    }
-    if (NULL != le_m)
-      continue; /** Attribute already in list **/
-    le_m = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    le_m->attribute = GNUNET_RECLAIM_attribute_new (le_b->attribute->name,
-                                                    &le_b->attribute->
-                                                    credential,
-                                                    le_b->attribute->type,
-                                                    le_b->attribute->data,
-                                                    le_b->attribute->data_size);
-    le_m->attribute->id = le_b->attribute->id;
-    le_m->attribute->flag = le_b->attribute->flag;
-    le_m->attribute->credential = le_b->attribute->credential;
-    GNUNET_CONTAINER_DLL_insert (merged_list->list_head,
-                                 merged_list->list_tail,
-                                 le_m);
-  }
-  return merged_list;
-}
-
-
-static void
-oidc_cred_collect_finished_cb (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_AttributeList *merged_list;
-  struct GNUNET_RECLAIM_AttributeListEntry *le_m;
-
-  handle->cred_it = NULL;
-  merged_list = attribute_list_merge (handle->attr_idtoken_list,
-                                      handle->attr_userinfo_list);
-  for (le_m = merged_list->list_head; NULL != le_m; le_m = le_m->next)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "List Attribute in ticket to issue: %s\n",
-                le_m->attribute->name);
-  handle->idp_op = GNUNET_RECLAIM_ticket_issue (idp,
-                                                &handle->priv_key,
-                                                &handle->oidc->client_pkey,
-                                                merged_list,
-                                                &oidc_ticket_issue_cb,
-                                                handle);
-  GNUNET_RECLAIM_attribute_list_destroy (merged_list);
-}
-
-
-/**
- * Collects all attributes for an ego if in scope parameter
- */
-static void
-oidc_cred_collect (void *cls,
-                   const struct GNUNET_CRYPTO_PublicKey *identity,
-                   const struct GNUNET_RECLAIM_Credential *cred)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  struct GNUNET_RECLAIM_CredentialListEntry *ale;
-
-  for (ale = handle->credentials->list_head; NULL != ale; ale = ale->next)
-  {
-    if (GNUNET_NO == GNUNET_RECLAIM_id_is_equal (&ale->credential->id,
-                                                 &cred->id))
-      continue;
-    /** Credential already in list **/
-    GNUNET_RECLAIM_get_credentials_next (handle->cred_it);
-    return;
-  }
-
-  for (le = handle->attr_idtoken_list->list_head; NULL != le; le = le->next)
-  {
-    if (GNUNET_NO == GNUNET_RECLAIM_id_is_equal (&le->attribute->credential,
-                                                 &cred->id))
-      continue;
-    /** Credential matches for attribute, add **/
-    ale = GNUNET_new (struct GNUNET_RECLAIM_CredentialListEntry);
-    ale->credential = GNUNET_RECLAIM_credential_new (cred->name,
-                                                     cred->type,
-                                                     cred->data,
-                                                     cred->data_size);
-    GNUNET_CONTAINER_DLL_insert (handle->credentials->list_head,
-                                 handle->credentials->list_tail,
-                                 ale);
-  }
-  GNUNET_RECLAIM_get_credentials_next (handle->cred_it);
-}
-
-
-static void
-oidc_attr_collect_finished_cb (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  handle->attr_it = NULL;
-  handle->ticket_it = NULL;
-  if (NULL == handle->attr_idtoken_list->list_head)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_SCOPE);
-    handle->edesc = GNUNET_strdup ("The requested scope is not available.");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    return;
-  }
-  handle->credentials = GNUNET_new (struct GNUNET_RECLAIM_CredentialList);
-  handle->cred_it =
-    GNUNET_RECLAIM_get_credentials_start (idp,
-                                          &handle->priv_key,
-                                          &oidc_iteration_error,
-                                          handle,
-                                          &oidc_cred_collect,
-                                          handle,
-                                          &oidc_cred_collect_finished_cb,
-                                          handle);
-
-}
-
-
-static int
-attr_in_claims_request (struct RequestHandle *handle,
-                        const char *attr_name,
-                        const char *claims_parameter)
-{
-  int ret = GNUNET_NO;
-  json_t *root;
-  json_error_t error;
-  json_t *claims_j;
-  const char *key;
-  json_t *value;
-
-  /** Check if attribute is requested through a scope **/
-  if (GNUNET_YES == OIDC_check_scopes_for_claim_request (handle->oidc->scope,
-                                                         attr_name))
-    return GNUNET_YES;
-
-  /** Try claims parameter if not in scope */
-  if (NULL != handle->oidc->claims)
-  {
-    root = json_loads (handle->oidc->claims, JSON_DECODE_ANY, &error);
-    claims_j = json_object_get (root, claims_parameter);
-    /* obj is a JSON object */
-    if (NULL != claims_j)
-    {
-      json_object_foreach (claims_j, key, value) {
-        if (0 != strcmp (attr_name, key))
-          continue;
-        ret = GNUNET_YES;
-        break;
-      }
-    }
-    json_decref (root);
-  }
-  return ret;
-}
-
-
-static int
-attr_in_idtoken_request (struct RequestHandle *handle,
-                         const char *attr_name)
-{
-  return attr_in_claims_request (handle, attr_name, "id_token");
-}
-
-
-static int
-attr_in_userinfo_request (struct RequestHandle *handle,
-                          const char *attr_name)
-{
-  return attr_in_claims_request (handle, attr_name, "userinfo");
-}
-
-
-/**
- * Collects all attributes for an ego if in scope parameter
- */
-static void
-oidc_attr_collect (void *cls,
-                   const struct GNUNET_CRYPTO_PublicKey *identity,
-                   const struct GNUNET_RECLAIM_Attribute *attr)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_AttributeListEntry *le;
-  if (GNUNET_YES == attr_in_idtoken_request (handle, attr->name))
-  {
-    le = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    le->attribute = GNUNET_RECLAIM_attribute_new (attr->name,
-                                                  &attr->credential,
-                                                  attr->type,
-                                                  attr->data,
-                                                  attr->data_size);
-    le->attribute->id = attr->id;
-    le->attribute->flag = attr->flag;
-    le->attribute->credential = attr->credential;
-    GNUNET_CONTAINER_DLL_insert (handle->attr_idtoken_list->list_head,
-                                 handle->attr_idtoken_list->list_tail,
-                                 le);
-  }
-  if (GNUNET_YES == attr_in_userinfo_request (handle, attr->name))
-  {
-    le = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    le->attribute = GNUNET_RECLAIM_attribute_new (attr->name,
-                                                  &attr->credential,
-                                                  attr->type,
-                                                  attr->data,
-                                                  attr->data_size);
-    le->attribute->id = attr->id;
-    le->attribute->flag = attr->flag;
-    le->attribute->credential = attr->credential;
-    GNUNET_CONTAINER_DLL_insert (handle->attr_userinfo_list->list_head,
-                                 handle->attr_userinfo_list->list_tail,
-                                 le);
-  }
-
-  GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
-}
-
-
-/**
- * Checks time and cookie and redirects accordingly
- */
-static void
-code_redirect (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_TIME_Absolute current_time;
-  struct GNUNET_TIME_Absolute *relog_time;
-  struct GNUNET_CRYPTO_PublicKey pubkey;
-  struct GNUNET_CRYPTO_PublicKey ego_pkey;
-  struct GNUNET_HashCode cache_key;
-  char *identity_cookie;
-
-  GNUNET_asprintf (&identity_cookie,
-                   "Identity=%s",
-                   handle->oidc->login_identity);
-  GNUNET_CRYPTO_hash (identity_cookie, strlen (identity_cookie), &cache_key);
-  GNUNET_free (identity_cookie);
-  // No login time for identity -> redirect to login
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_multihashmap_contains (OIDC_cookie_jar_map, &cache_key))
-  {
-    relog_time =
-      GNUNET_CONTAINER_multihashmap_get (OIDC_cookie_jar_map, &cache_key);
-    current_time = GNUNET_TIME_absolute_get ();
-    // 30 min after old login -> redirect to login
-    if (current_time.abs_value_us <= relog_time->abs_value_us)
-    {
-      if (GNUNET_OK !=
-          GNUNET_CRYPTO_public_key_from_string (handle->oidc
-                                                  ->login_identity,
-                                                  &pubkey))
-      {
-        handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_COOKIE);
-        handle->edesc =
-          GNUNET_strdup ("The cookie of a login identity is not valid");
-        GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-        return;
-      }
-      // iterate over egos and compare their public key
-      for (handle->ego_entry = ego_head; NULL != handle->ego_entry;
-           handle->ego_entry = handle->ego_entry->next)
-      {
-        GNUNET_IDENTITY_ego_get_public_key (handle->ego_entry->ego, &ego_pkey);
-        if (0 == GNUNET_memcmp (&ego_pkey, &pubkey))
-        {
-          handle->priv_key =
-            *GNUNET_IDENTITY_ego_get_private_key (handle->ego_entry->ego);
-          handle->attr_idtoken_list =
-            GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-          handle->attr_userinfo_list =
-            GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-          handle->attr_it =
-            GNUNET_RECLAIM_get_attributes_start (idp,
-                                                 &handle->priv_key,
-                                                 &oidc_iteration_error,
-                                                 handle,
-                                                 &oidc_attr_collect,
-                                                 handle,
-                                                 &oidc_attr_collect_finished_cb,
-                                                 handle);
-          return;
-        }
-      }
-      GNUNET_SCHEDULER_add_now (&login_redirect, handle);
-      return;
-    }
-  }
-}
-
-
-static void
-build_redirect (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *redirect_uri;
-
-  if (GNUNET_YES == handle->oidc->user_cancelled)
-  {
-    if ((NULL != handle->redirect_prefix) &&
-        (NULL != handle->redirect_suffix) && (NULL != handle->tld))
-    {
-      GNUNET_asprintf (&redirect_uri,
-                       "%s.%s/%s?error=%s&error_description=%s&state=%s",
-                       handle->redirect_prefix,
-                       handle->tld,
-                       handle->redirect_suffix,
-                       "access_denied",
-                       "User denied access",
-                       handle->oidc->state);
-    }
-    else
-    {
-      GNUNET_asprintf (&redirect_uri,
-                       "%s?error=%s&error_description=%s&state=%s",
-                       handle->oidc->redirect_uri,
-                       "access_denied",
-                       "User denied access",
-                       handle->oidc->state);
-    }
-    resp = GNUNET_REST_create_response ("");
-    GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                      "Location",
-                                                      redirect_uri));
-    handle->proc (handle->proc_cls, resp, MHD_HTTP_FOUND);
-    cleanup_handle (handle);
-    GNUNET_free (redirect_uri);
-    return;
-  }
-  GNUNET_SCHEDULER_add_now (&code_redirect, handle);
-}
-
-
-static void
-lookup_redirect_uri_result (void *cls,
-                            uint32_t rd_count,
-                            const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct RequestHandle *handle = cls;
-  char *tmp;
-  char *tmp_key_str;
-  char *pos;
-  struct GNUNET_CRYPTO_PublicKey redirect_zone;
-
-  handle->gns_op = NULL;
-  if (0 == rd_count)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-    handle->edesc =
-      GNUNET_strdup ("Server cannot generate ticket, redirect uri not found.");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    return;
-  }
-  for (int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT != rd[i].record_type)
-      continue;
-    if (0 != strncmp (rd[i].data, handle->oidc->redirect_uri, rd[i].data_size))
-      continue;
-    tmp = GNUNET_strndup (rd[i].data, rd[i].data_size);
-    if (NULL == strstr (tmp, handle->oidc->client_id))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Redirect uri %s does not contain client_id %s\n",
-                  tmp,
-                  handle->oidc->client_id);
-    }
-    else
-    {
-      pos = strrchr (tmp, (unsigned char) '.');
-      if (NULL == pos)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Redirect uri %s contains client_id but is malformed\n",
-                    tmp);
-        GNUNET_free (tmp);
-        continue;
-      }
-      *pos = '\0';
-      handle->redirect_prefix = GNUNET_strdup (tmp);
-      tmp_key_str = pos + 1;
-      pos = strchr (tmp_key_str, (unsigned char) '/');
-      if (NULL == pos)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Redirect uri %s contains client_id but is malformed\n",
-                    tmp);
-        GNUNET_free (tmp);
-        continue;
-      }
-      *pos = '\0';
-      handle->redirect_suffix = GNUNET_strdup (pos + 1);
-
-      GNUNET_STRINGS_string_to_data (tmp_key_str,
-                                     strlen (tmp_key_str),
-                                     &redirect_zone,
-                                     sizeof(redirect_zone));
-    }
-    GNUNET_SCHEDULER_add_now (&build_redirect, handle);
-    GNUNET_free (tmp);
-    return;
-  }
-  handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-  handle->edesc =
-    GNUNET_strdup ("Server cannot generate ticket, redirect uri not found.");
-  GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-}
-
-
-/**
- * Initiate redirect back to client.
- */
-static void
-client_redirect (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  /* Lookup client redirect uri to verify request */
-  handle->gns_op =
-    GNUNET_GNS_lookup (gns_handle,
-                       GNUNET_GNS_EMPTY_LABEL_AT,
-                       &handle->oidc->client_pkey,
-                       GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT,
-                       GNUNET_GNS_LO_DEFAULT,
-                       &lookup_redirect_uri_result,
-                       handle);
-}
-
-
-static char *
-get_url_parameter_copy (const struct RequestHandle *handle, const char *key)
-{
-  struct GNUNET_HashCode hc;
-  char *value;
-  char *res;
-
-  GNUNET_CRYPTO_hash (key, strlen (key), &hc);
-  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                            ->url_param_map,
-                                                            &hc))
-    return NULL;
-  value =
-    GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->url_param_map, &hc);
-  if (NULL == value)
-    return NULL;
-  GNUNET_STRINGS_urldecode (value, strlen (value), &res);
-  return res;
-}
-
-
-/**
- * Iteration over all results finished, build final
- * response.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-build_authz_response (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_HashCode cache_key;
-
-  char *expected_scope;
-  char delimiter[] = " ";
-  int number_of_ignored_parameter, iterator;
-
-
-  // REQUIRED value: redirect_uri
-  handle->oidc->redirect_uri =
-    get_url_parameter_copy (handle, OIDC_REDIRECT_URI_KEY);
-  if (NULL == handle->oidc->redirect_uri)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("missing parameter redirect_uri");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // REQUIRED value: response_type
-  handle->oidc->response_type =
-    get_url_parameter_copy (handle, OIDC_RESPONSE_TYPE_KEY);
-  if (NULL == handle->oidc->response_type)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("missing parameter response_type");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    return;
-  }
-
-  // REQUIRED value: scope
-  handle->oidc->scope = get_url_parameter_copy (handle, OIDC_SCOPE_KEY);
-  if (NULL == handle->oidc->scope)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_SCOPE);
-    handle->edesc = GNUNET_strdup ("missing parameter scope");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    return;
-  }
-
-  // OPTIONAL value: nonce
-  handle->oidc->nonce = get_url_parameter_copy (handle, OIDC_NONCE_KEY);
-
-  // OPTIONAL value: claims
-  handle->oidc->claims = get_url_parameter_copy (handle, OIDC_CLAIMS_KEY);
-
-  // TODO check other values if needed
-  number_of_ignored_parameter =
-    sizeof(OIDC_ignored_parameter_array) / sizeof(char *);
-  for (iterator = 0; iterator < number_of_ignored_parameter; iterator++)
-  {
-    GNUNET_CRYPTO_hash (OIDC_ignored_parameter_array[iterator],
-                        strlen (OIDC_ignored_parameter_array[iterator]),
-                        &cache_key);
-    if (GNUNET_YES ==
-        GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                ->url_param_map,
-                                                &cache_key))
-    {
-      handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_ACCESS_DENIED);
-      GNUNET_asprintf (&handle->edesc,
-                       "Server will not handle parameter: %s",
-                       OIDC_ignored_parameter_array[iterator]);
-      GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-      return;
-    }
-  }
-
-  // We only support authorization code flows.
-  if (0 != strcmp (handle->oidc->response_type,
-                   OIDC_EXPECTED_AUTHORIZATION_RESPONSE_TYPE))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_UNSUPPORTED_RESPONSE_TYPE);
-    handle->edesc = GNUNET_strdup ("The authorization server does not support "
-                                   "obtaining this authorization code.");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    return;
-  }
-
-  // Checks if scope contains 'openid'
-  expected_scope = GNUNET_strdup (handle->oidc->scope);
-  char *test;
-  test = strtok (expected_scope, delimiter);
-  while (NULL != test)
-  {
-    if (0 == strcmp (OIDC_EXPECTED_AUTHORIZATION_SCOPE, expected_scope))
-      break;
-    test = strtok (NULL, delimiter);
-  }
-  if (NULL == test)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_SCOPE);
-    handle->edesc =
-      GNUNET_strdup ("The requested scope is invalid, unknown, or malformed.");
-    GNUNET_SCHEDULER_add_now (&do_redirect_error, handle);
-    GNUNET_free (expected_scope);
-    return;
-  }
-
-  GNUNET_free (expected_scope);
-  if ((NULL == handle->oidc->login_identity) &&
-      (GNUNET_NO == handle->oidc->user_cancelled))
-    GNUNET_SCHEDULER_add_now (&login_redirect, handle);
-  else
-    GNUNET_SCHEDULER_add_now (&client_redirect, handle);
-}
-
-
-/**
- * Iterate over tlds in config
- */
-static void
-tld_iter (void *cls, const char *section, const char *option, const char *value)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_public_key_from_string (value, &pkey))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Skipping non key %s\n", value);
-    return;
-  }
-  if (0 == GNUNET_memcmp (&pkey, &handle->oidc->client_pkey))
-    handle->tld = GNUNET_strdup (option + 1);
-}
-
-
-/**
- * Responds to authorization GET and url-encoded POST request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
-                    const char *url,
-                    void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct EgoEntry *tmp_ego;
-  const struct GNUNET_CRYPTO_PrivateKey *priv_key;
-  struct GNUNET_CRYPTO_PublicKey pkey;
-
-  cookie_identity_interpretation (handle);
-
-  // RECOMMENDED value: state - REQUIRED for answers
-  handle->oidc->state = get_url_parameter_copy (handle, OIDC_STATE_KEY);
-
-  // REQUIRED value: client_id
-  handle->oidc->client_id = get_url_parameter_copy (handle, OIDC_CLIENT_ID_KEY);
-  if (NULL == handle->oidc->client_id)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("missing parameter client_id");
-    handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // OPTIONAL value: code_challenge
-  handle->oidc->code_challenge = get_url_parameter_copy (handle,
-                                                         OIDC_CODE_CHALLENGE_KEY);
-  if (NULL == handle->oidc->code_challenge)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "OAuth authorization request does not contain PKCE parameters!\n");
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_public_key_from_string (handle->oidc->client_id,
-                                              &handle->oidc->client_pkey))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_UNAUTHORIZED_CLIENT);
-    handle->edesc = GNUNET_strdup ("The client is not authorized to request an "
-                                   "authorization code using this method.");
-    handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // If we know this identity, translated the corresponding TLD
-  // TODO: We might want to have a reverse lookup functionality for TLDs?
-  for (tmp_ego = ego_head; NULL != tmp_ego; tmp_ego = tmp_ego->next)
-  {
-    priv_key = GNUNET_IDENTITY_ego_get_private_key (tmp_ego->ego);
-    GNUNET_CRYPTO_key_get_public (priv_key, &pkey);
-    if (0 == GNUNET_memcmp (&pkey, &handle->oidc->client_pkey))
-    {
-      handle->tld = GNUNET_strdup (tmp_ego->identifier);
-      handle->ego_entry = ego_tail;
-    }
-  }
-  if (NULL == handle->tld)
-    GNUNET_CONFIGURATION_iterate_section_values (cfg, "gns", tld_iter, handle);
-  if (NULL == handle->tld)
-    handle->tld = GNUNET_strdup (handle->oidc->client_id);
-  GNUNET_SCHEDULER_add_now (&build_authz_response, handle);
-}
-
-
-/**
- * Combines an identity with a login time and responds OK to login request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-login_cont (struct GNUNET_REST_RequestHandle *con_handle,
-            const char *url,
-            void *cls)
-{
-  struct MHD_Response *resp = GNUNET_REST_create_response ("");
-  struct RequestHandle *handle = cls;
-  struct GNUNET_HashCode cache_key;
-  struct GNUNET_TIME_Absolute *current_time;
-  struct GNUNET_TIME_Absolute *last_time;
-  char *cookie;
-  char *header_val;
-  json_t *root;
-  json_error_t error;
-  json_t *identity;
-  char term_data[handle->rest_handle->data_size + 1];
-
-  term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy (term_data,
-                 handle->rest_handle->data,
-                 handle->rest_handle->data_size);
-  root = json_loads (term_data, JSON_DECODE_ANY, &error);
-  identity = json_object_get (root, "identity");
-  if (! json_is_string (identity))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error parsing json string from %s\n",
-                term_data);
-    handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
-    json_decref (root);
-    cleanup_handle (handle);
-    return;
-  }
-  GNUNET_asprintf (&cookie, "Identity=%s", json_string_value (identity));
-  GNUNET_asprintf (&header_val,
-                   "%s;Max-Age=%d",
-                   cookie,
-                   OIDC_COOKIE_EXPIRATION);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Set-Cookie", header_val));
-  GNUNET_assert (MHD_NO !=
-                 MHD_add_response_header (resp,
-                                          "Access-Control-Allow-Methods",
-                                          "POST"));
-  GNUNET_CRYPTO_hash (cookie, strlen (cookie), &cache_key);
-
-  if (0 != strcmp (json_string_value (identity), "Denied"))
-  {
-    current_time = GNUNET_new (struct GNUNET_TIME_Absolute);
-    *current_time = GNUNET_TIME_relative_to_absolute (
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_relative_get_second_ (),
-                                     OIDC_COOKIE_EXPIRATION));
-    last_time =
-      GNUNET_CONTAINER_multihashmap_get (OIDC_cookie_jar_map, &cache_key);
-    GNUNET_free (last_time);
-    GNUNET_CONTAINER_multihashmap_put (OIDC_cookie_jar_map,
-                                       &cache_key,
-                                       current_time,
-                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-  }
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_free (cookie);
-  GNUNET_free (header_val);
-  json_decref (root);
-  cleanup_handle (handle);
-}
-
-
-static int
-parse_credentials_basic_auth (struct RequestHandle *handle,
-                              char **client_id,
-                              char **client_secret)
-{
-  struct GNUNET_HashCode cache_key;
-  char *authorization;
-  char *credentials;
-  char *basic_authorization;
-  char *client_id_tmp;
-  char *pass;
-
-  GNUNET_CRYPTO_hash (OIDC_AUTHORIZATION_HEADER_KEY,
-                      strlen (OIDC_AUTHORIZATION_HEADER_KEY),
-                      &cache_key);
-  if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                           ->header_param_map,
-                                                           &cache_key))
-    return GNUNET_SYSERR;
-  authorization =
-    GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->header_param_map,
-                                       &cache_key);
-
-  // split header in "Basic" and [content]
-  credentials = strtok (authorization, " ");
-  if ((NULL == credentials) || (0 != strcmp ("Basic", credentials)))
-    return GNUNET_SYSERR;
-  credentials = strtok (NULL, " ");
-  if (NULL == credentials)
-    return GNUNET_SYSERR;
-  GNUNET_STRINGS_base64_decode (credentials,
-                                strlen (credentials),
-                                (void **) &basic_authorization);
-
-  if (NULL == basic_authorization)
-    return GNUNET_SYSERR;
-  client_id_tmp = strtok (basic_authorization, ":");
-  if (NULL == client_id_tmp)
-  {
-    GNUNET_free (basic_authorization);
-    return GNUNET_SYSERR;
-  }
-  pass = strtok (NULL, ":");
-  if (NULL == pass)
-  {
-    GNUNET_free (basic_authorization);
-    return GNUNET_SYSERR;
-  }
-  *client_id = strdup (client_id_tmp);
-  *client_secret = strdup (pass);
-  GNUNET_free (basic_authorization);
-  return GNUNET_OK;
-}
-
-
-static int
-parse_credentials_post_body (struct RequestHandle *handle,
-                             char **client_id,
-                             char **client_secret)
-{
-  struct GNUNET_HashCode cache_key;
-  char *client_id_tmp;
-  char *pass;
-
-  GNUNET_CRYPTO_hash ("client_id",
-                      strlen ("client_id"),
-                      &cache_key);
-  if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                           ->url_param_map,
-                                                           &cache_key))
-    return GNUNET_SYSERR;
-  client_id_tmp = GNUNET_CONTAINER_multihashmap_get (
-    handle->rest_handle->url_param_map,
-    &cache_key);
-  if (NULL == client_id_tmp)
-    return GNUNET_SYSERR;
-  *client_id = strdup (client_id_tmp);
-  GNUNET_CRYPTO_hash ("client_secret",
-                      strlen ("client_secret"),
-                      &cache_key);
-  if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                           ->url_param_map,
-                                                           &cache_key))
-  {
-    GNUNET_free (*client_id);
-    *client_id = NULL;
-    return GNUNET_SYSERR;
-  }
-  pass = GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->url_param_map,
-                                            &cache_key);
-  if (NULL == pass)
-  {
-    GNUNET_free (*client_id);
-    *client_id = NULL;
-    return GNUNET_SYSERR;
-  }
-  *client_secret = strdup (pass);
-  return GNUNET_OK;
-}
-
-
-static int
-check_authorization (struct RequestHandle *handle,
-                     struct GNUNET_CRYPTO_PublicKey *cid)
-{
-  char *expected_pass;
-  char *received_cid;
-  char *received_cpw;
-  char *pkce_cv;
-
-  if (GNUNET_OK == parse_credentials_basic_auth (handle,
-                                                 &received_cid,
-                                                 &received_cpw))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received client credentials in HTTP AuthZ header\n");
-  }
-  else if (GNUNET_OK == parse_credentials_post_body (handle,
-                                                     &received_cid,
-                                                     &received_cpw))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received client credentials in POST body\n");
-  }
-  else
-  {
-    /** Allow public clients with PKCE **/
-    pkce_cv = get_url_parameter_copy (handle, OIDC_CODE_VERIFIER_KEY);
-    if (NULL == pkce_cv)
-    {
-      handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
-      handle->response_code = MHD_HTTP_UNAUTHORIZED;
-      return GNUNET_SYSERR;
-    }
-    handle->public_client = GNUNET_YES;
-    GNUNET_free (pkce_cv);
-    received_cid = get_url_parameter_copy (handle, OIDC_CLIENT_ID_KEY);
-    GNUNET_STRINGS_string_to_data (received_cid,
-                                   strlen (received_cid),
-                                   cid,
-                                   sizeof(struct GNUNET_CRYPTO_PublicKey));
-    GNUNET_free (received_cid);
-    return GNUNET_OK;
-
-  }
-
-  // check client password
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                          "reclaim-rest-plugin",
-                                                          "OIDC_CLIENT_HMAC_SECRET",
-                                                          &expected_pass))
-  {
-    if (0 != strcmp (expected_pass, received_cpw))
-    {
-      GNUNET_free (expected_pass);
-      handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
-      handle->response_code = MHD_HTTP_UNAUTHORIZED;
-      GNUNET_free (received_cpw);
-      GNUNET_free (received_cid);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (expected_pass);
-  }
-  else
-  {
-    GNUNET_free (received_cpw);
-    GNUNET_free (received_cid);
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-    handle->edesc = GNUNET_strdup ("gnunet configuration failed");
-    handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    return GNUNET_SYSERR;
-  }
-  // check client_id
-  for (handle->ego_entry = ego_head; NULL != handle->ego_entry;
-       handle->ego_entry = handle->ego_entry->next)
-  {
-    if (0 == strcmp (handle->ego_entry->keystring, received_cid))
-      break;
-  }
-  if (NULL == handle->ego_entry)
-  {
-    GNUNET_free (received_cpw);
-    GNUNET_free (received_cid);
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STRINGS_string_to_data (received_cid,
-                                 strlen (received_cid),
-                                 cid,
-                                 sizeof(struct GNUNET_CRYPTO_PublicKey));
-
-  GNUNET_free (received_cpw);
-  GNUNET_free (received_cid);
-  return GNUNET_OK;
-}
-
-
-const struct EgoEntry *
-find_ego (struct RequestHandle *handle,
-          struct GNUNET_CRYPTO_PublicKey *test_key)
-{
-  struct EgoEntry *ego_entry;
-  struct GNUNET_CRYPTO_PublicKey pub_key;
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-  {
-    GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &pub_key);
-    if (0 == GNUNET_memcmp (&pub_key, test_key))
-      return ego_entry;
-  }
-  return NULL;
-}
-
-
-/**
- * Responds to token url-encoded POST request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
-                const char *url,
-                void *cls)
-{
-  struct RequestHandle *handle = cls;
-  const struct EgoEntry *ego_entry = NULL;
-  struct GNUNET_TIME_Relative expiration_time;
-  struct GNUNET_RECLAIM_AttributeList *cl = NULL;
-  struct GNUNET_RECLAIM_PresentationList *pl = NULL;
-  struct GNUNET_RECLAIM_Ticket ticket;
-  struct GNUNET_CRYPTO_PublicKey cid;
-  struct GNUNET_HashCode cache_key;
-  struct MHD_Response *resp = NULL;
-  char *grant_type = NULL;
-  char *code = NULL;
-  char *json_response = NULL;
-  char *id_token = NULL;
-  char *access_token = NULL;
-  char *jwa = NULL;
-  char *jwt_secret = NULL;
-  char *nonce = NULL;
-  char *code_verifier = NULL;
-  json_t *oidc_jwk = NULL;
-  char *oidc_jwk_path = NULL;
-  char *oidc_directory = NULL;
-  char *tmp_at = NULL;
-
-  /*
-   * Check Authorization
-   */
-  if (GNUNET_SYSERR == check_authorization (handle, &cid))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "OIDC authorization for token endpoint failed\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  /*
-   * Check parameter
-   */
-
-  // TODO Do not allow multiple equal parameter names
-  // REQUIRED grant_type
-  GNUNET_CRYPTO_hash (OIDC_GRANT_TYPE_KEY,
-                      strlen (OIDC_GRANT_TYPE_KEY),
-                      &cache_key);
-  grant_type = get_url_parameter_copy (handle, OIDC_GRANT_TYPE_KEY);
-  if (NULL == grant_type)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("missing parameter grant_type");
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // Check parameter grant_type == "authorization_code"
-  if (0 != strcmp (OIDC_GRANT_TYPE_VALUE, grant_type))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_UNSUPPORTED_GRANT_TYPE);
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-    GNUNET_free (grant_type);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  GNUNET_free (grant_type);
-  // REQUIRED code
-  code = get_url_parameter_copy (handle, OIDC_CODE_KEY);
-  if (NULL == code)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("missing parameter code");
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  ego_entry = find_ego (handle, &cid);
-  if (NULL == ego_entry)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("Unknown client");
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-    GNUNET_free (code);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // REQUIRED code verifier
-  code_verifier = get_url_parameter_copy (handle, OIDC_CODE_VERIFIER_KEY);
-  if (NULL == code_verifier)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "OAuth authorization request does not contain PKCE parameters!\n");
-
-  }
-
-  // decode code
-  if (GNUNET_OK != OIDC_parse_authz_code (&cid, code, code_verifier, &ticket,
-                                          &cl, &pl, &nonce,
-                                          OIDC_VERIFICATION_DEFAULT))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("invalid code");
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-    GNUNET_free (code);
-    if (NULL != code_verifier)
-      GNUNET_free (code_verifier);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  if (NULL != code_verifier)
-    GNUNET_free (code_verifier);
-
-  // create jwt
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg,
-                                                        "reclaim-rest-plugin",
-                                                        "expiration_time",
-                                                        &expiration_time))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
-    handle->edesc = GNUNET_strdup ("gnunet configuration failed");
-    handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    GNUNET_free (code);
-    if (NULL != nonce)
-      GNUNET_free (nonce);
-    GNUNET_RECLAIM_attribute_list_destroy (cl);
-    GNUNET_RECLAIM_presentation_list_destroy (pl);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // Check if HMAC or RSA should be used
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                          "reclaim-rest-plugin",
-                                                          "oidc_json_web_algorithm",
-                                                          &jwa))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Could not read OIDC JSON Web Algorithm config attribute."
-                "Defaulting to RS256.");
-    jwa = JWT_ALG_VALUE_RSA;
-  }
-
-  if ( ! strcmp (jwa, JWT_ALG_VALUE_RSA))
-  {
-    // Replace for now
-    oidc_jwk_path = get_oidc_jwk_path (cls);
-    oidc_jwk = read_jwk_from_file (oidc_jwk_path);
-
-    // Check if secret JWK exists
-    if (! oidc_jwk)
-    {
-      // Generate and save a new key
-      oidc_jwk = generate_jwk ();
-      oidc_directory = get_oidc_dir_path (cls);
-
-      // Create new oidc directory
-      if (GNUNET_OK != GNUNET_DISK_directory_create (oidc_directory))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    ("Failed to create directory `%s' for storing oidc data\n"),
-                    oidc_directory);
-      }
-      else
-      {
-        write_jwk_to_file (oidc_jwk_path, oidc_jwk);
-      }
-    }
-
-    // Generate oidc token
-    id_token = OIDC_generate_id_token_rsa (&ticket.audience,
-                                           &ticket.identity,
-                                           cl,
-                                           pl,
-                                           &expiration_time,
-                                           (NULL != nonce) ? nonce : NULL,
-                                           oidc_jwk);
-  }
-  else if ( ! strcmp (jwa, JWT_ALG_VALUE_HMAC))
-  {
-    // TODO OPTIONAL acr,amr,azp
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                            "reclaim-rest-plugin",
-                                                            "jwt_secret",
-                                                            &jwt_secret))
-    {
-      handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-      handle->edesc = GNUNET_strdup ("No signing secret configured!");
-      handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-      GNUNET_free (code);
-      GNUNET_RECLAIM_attribute_list_destroy (cl);
-      GNUNET_RECLAIM_presentation_list_destroy (pl);
-      if (NULL != nonce)
-        GNUNET_free (nonce);
-      GNUNET_SCHEDULER_add_now (&do_error, handle);
-      return;
-    }
-
-    id_token = OIDC_generate_id_token_hmac (&ticket.audience,
-                                            &ticket.identity,
-                                            cl,
-                                            pl,
-                                            &expiration_time,
-                                            (NULL != nonce) ? nonce : NULL,
-                                            jwt_secret);
-
-    GNUNET_free (jwt_secret);
-  }
-  else
-  {
-    // TODO: OPTION NOT FOUND ERROR
-  }
-
-  if (NULL != nonce)
-    GNUNET_free (nonce);
-  access_token = OIDC_access_token_new (&ticket);
-  /**
-   * Store mapping from access token to code so we can later
-   * fall back on the provided attributes in userinfo one time.
-   */
-  GNUNET_CRYPTO_hash (access_token,
-                      strlen (access_token),
-                      &cache_key);
-  /**
-   * Note to future self: This cache has the following purpose:
-   * Some OIDC plugins call the userendpoint right after receiving an
-   * ID token and access token. There are reasons why this would make sense.
-   * Others not so much.
-   * In any case, in order to smoothen out the user experience upon login
-   * (authorization), we speculatively cache the next
-   * userinfo response in case the actual resolution through reclaim/GNS
-   * takes too long.
-   */
-  tmp_at = GNUNET_CONTAINER_multihashmap_get (oidc_code_cache,
-                                              &cache_key);
-  GNUNET_CONTAINER_multihashmap_put (oidc_code_cache,
-                                     &cache_key,
-                                     code,
-                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-  /* If there was a previous code in there, free the old value */
-  if (NULL != tmp_at)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "OIDC access token already issued. Cleanup.\n");
-    GNUNET_free (tmp_at);
-  }
-
-  OIDC_build_token_response (access_token,
-                             id_token,
-                             &expiration_time,
-                             &json_response);
-
-  resp = GNUNET_REST_create_response (json_response);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Cache-Control",
-                                                    "no-store"));
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Pragma", "no-cache"));
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Content-Type",
-                                                    "application/json"));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_RECLAIM_attribute_list_destroy (cl);
-  GNUNET_RECLAIM_presentation_list_destroy (pl);
-  GNUNET_free (access_token);
-  GNUNET_free (json_response);
-  GNUNET_free (id_token);
-  cleanup_handle (handle);
-}
-
-
-/**
- * Collects claims and stores them in handle
- */
-static void
-consume_ticket (void *cls,
-                const struct GNUNET_CRYPTO_PublicKey *identity,
-                const struct GNUNET_RECLAIM_Attribute *attr,
-                const struct GNUNET_RECLAIM_Presentation *presentation)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_RECLAIM_PresentationListEntry *atle;
-  struct MHD_Response *resp;
-  struct GNUNET_HashCode cache_key;
-  char *result_str;
-  char *cached_code;
-
-  if (NULL != handle->consume_timeout_op)
-    GNUNET_SCHEDULER_cancel (handle->consume_timeout_op);
-  handle->consume_timeout_op = NULL;
-  handle->idp_op = NULL;
-
-  /**
-   * We received a reply. In any case clear the cache.
-   */
-  GNUNET_CRYPTO_hash (handle->access_token,
-                      strlen (handle->access_token),
-                      &cache_key);
-  cached_code = GNUNET_CONTAINER_multihashmap_get (oidc_code_cache,
-                                                   &cache_key);
-  if (NULL != cached_code)
-  {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap_remove (oidc_code_cache,
-                                                         &cache_key,
-                                                         cached_code));
-    GNUNET_free (cached_code);
-  }
-
-
-  if (NULL == identity)
-  {
-    result_str = OIDC_generate_userinfo (&handle->ticket.identity,
-                                         handle->attr_userinfo_list,
-                                         handle->presentations);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Userinfo: %s\n", result_str);
-    resp = GNUNET_REST_create_response (result_str);
-    handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-    GNUNET_free (result_str);
-    cleanup_handle (handle);
-    return;
-  }
-  ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-  ale->attribute = GNUNET_RECLAIM_attribute_new (attr->name,
-                                                 &attr->credential,
-                                                 attr->type,
-                                                 attr->data,
-                                                 attr->data_size);
-  ale->attribute->id = attr->id;
-  ale->attribute->flag = attr->flag;
-  ale->attribute->credential = attr->credential;
-  GNUNET_CONTAINER_DLL_insert (handle->attr_userinfo_list->list_head,
-                               handle->attr_userinfo_list->list_tail,
-                               ale);
-  if (NULL == presentation)
-    return;
-  for (atle = handle->presentations->list_head;
-       NULL != atle; atle = atle->next)
-  {
-    if (GNUNET_NO == GNUNET_RECLAIM_id_is_equal (
-          &atle->presentation->credential_id,
-          &presentation->credential_id))
-      continue;
-    break; /** already in list **/
-  }
-  if (NULL == atle)
-  {
-    /** Credential matches for attribute, add **/
-    atle = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-    atle->presentation = GNUNET_RECLAIM_presentation_new (presentation->type,
-                                                          presentation->data,
-                                                          presentation->
-                                                          data_size);
-    atle->presentation->credential_id = presentation->credential_id;
-    GNUNET_CONTAINER_DLL_insert (handle->presentations->list_head,
-                                 handle->presentations->list_tail,
-                                 atle);
-  }
-}
-
-
-static void
-consume_fail (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_HashCode cache_key;
-  struct GNUNET_RECLAIM_AttributeList *cl = NULL;
-  struct GNUNET_RECLAIM_PresentationList *pl = NULL;
-  struct GNUNET_RECLAIM_Ticket ticket;
-  struct MHD_Response *resp;
-  char *nonce;
-  char *cached_code;
-  char *result_str;
-
-
-  handle->consume_timeout_op = NULL;
-  if (NULL != handle->idp_op)
-    GNUNET_RECLAIM_cancel (handle->idp_op);
-  handle->idp_op = NULL;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Ticket consumptioned timed out. Using cache...\n");
-  GNUNET_CRYPTO_hash (handle->access_token,
-                      strlen (handle->access_token),
-                      &cache_key);
-  cached_code = GNUNET_CONTAINER_multihashmap_get (oidc_code_cache,
-                                                   &cache_key);
-  if (NULL == cached_code)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
-    handle->edesc = GNUNET_strdup ("No Access Token in cache!");
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    GNUNET_SCHEDULER_add_now (&do_userinfo_error, handle);
-    return;
-  }
-  /**
-   * Remove the cached item
-   */
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove (oidc_code_cache,
-                                                       &cache_key,
-                                                       cached_code));
-
-  // decode code
-  if (GNUNET_OK != OIDC_parse_authz_code (&handle->ticket.audience,
-                                          cached_code, NULL, &ticket,
-                                          &cl, &pl, &nonce,
-                                          OIDC_VERIFICATION_NO_CODE_VERIFIER))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("invalid code");
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-    GNUNET_free (cached_code);
-    if (NULL != nonce)
-      GNUNET_free (nonce);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  GNUNET_free (cached_code);
-
-  result_str = OIDC_generate_userinfo (&handle->ticket.identity,
-                                       cl,
-                                       pl);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Userinfo: %s\n", result_str);
-  resp = GNUNET_REST_create_response (result_str);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_free (result_str);
-  GNUNET_free (nonce);
-  GNUNET_RECLAIM_attribute_list_destroy (cl);
-  GNUNET_RECLAIM_presentation_list_destroy (pl);
-  cleanup_handle (handle);
-}
-
-
-/**
- * Responds to userinfo GET and url-encoded POST request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
-                   const char *url,
-                   void *cls)
-{
-  // TODO expiration time
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_Ticket *ticket;
-  char delimiter[] = " ";
-  struct GNUNET_HashCode cache_key;
-  char *authorization;
-  char *authorization_type;
-  char *authorization_access_token;
-  const struct EgoEntry *aud_ego;
-  const struct GNUNET_CRYPTO_PrivateKey *privkey;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Getting userinfo\n");
-  GNUNET_CRYPTO_hash (OIDC_AUTHORIZATION_HEADER_KEY,
-                      strlen (OIDC_AUTHORIZATION_HEADER_KEY),
-                      &cache_key);
-  if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (handle->rest_handle
-                                                           ->header_param_map,
-                                                           &cache_key))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
-    handle->edesc = GNUNET_strdup ("No Access Token");
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    GNUNET_SCHEDULER_add_now (&do_userinfo_error, handle);
-    return;
-  }
-  authorization =
-    GNUNET_CONTAINER_multihashmap_get (handle->rest_handle->header_param_map,
-                                       &cache_key);
-
-  // split header in "Bearer" and access_token
-  authorization = GNUNET_strdup (authorization);
-  authorization_type = strtok (authorization, delimiter);
-  if ((NULL == authorization_type) ||
-      (0 != strcmp ("Bearer", authorization_type)))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
-    handle->edesc = GNUNET_strdup ("No Access Token");
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    GNUNET_SCHEDULER_add_now (&do_userinfo_error, handle);
-    GNUNET_free (authorization);
-    return;
-  }
-  authorization_access_token = strtok (NULL, delimiter);
-  if (NULL == authorization_access_token)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
-    handle->edesc = GNUNET_strdup ("Access token missing");
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    GNUNET_SCHEDULER_add_now (&do_userinfo_error, handle);
-    GNUNET_free (authorization);
-    return;
-  }
-
-  if (GNUNET_OK != OIDC_access_token_parse (authorization_access_token,
-                                            &ticket))
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
-    handle->edesc = GNUNET_strdup ("The access token is invalid");
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    GNUNET_SCHEDULER_add_now (&do_userinfo_error, handle);
-    GNUNET_free (authorization);
-    return;
-
-  }
-  GNUNET_assert (NULL != ticket);
-  handle->ticket = *ticket;
-  GNUNET_free (ticket);
-  aud_ego = find_ego (handle, &handle->ticket.audience);
-  if (NULL == aud_ego)
-  {
-    handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
-    handle->edesc = GNUNET_strdup ("The access token expired");
-    handle->response_code = MHD_HTTP_UNAUTHORIZED;
-    GNUNET_SCHEDULER_add_now (&do_userinfo_error, handle);
-    GNUNET_free (authorization);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Consuming ticket\n");
-  privkey = GNUNET_IDENTITY_ego_get_private_key (aud_ego->ego);
-  handle->attr_userinfo_list =
-    GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  handle->presentations =
-    GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
-
-  /* If the consume takes too long, we use values from the cache */
-  handle->access_token = GNUNET_strdup (authorization_access_token);
-  handle->consume_timeout_op = GNUNET_SCHEDULER_add_delayed (consume_timeout,
-                                                             &consume_fail,
-                                                             handle);
-  handle->idp_op = GNUNET_RECLAIM_ticket_consume (idp,
-                                                  privkey,
-                                                  &handle->ticket,
-                                                  &consume_ticket,
-                                                  handle);
-  GNUNET_free (authorization);
-}
-
-/**
- * Responds to /jwks.json
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-jwks_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
-               const char *url,
-               void *cls)
-{
-  char *oidc_directory;
-  char *oidc_jwk_path;
-  char *oidc_jwk_pub_str;
-  json_t *oidc_jwk;
-  struct MHD_Response *resp;
-  struct RequestHandle *handle = cls;
-
-  oidc_jwk_path = get_oidc_jwk_path (cls);
-  oidc_jwk = read_jwk_from_file (oidc_jwk_path);
-
-  // Check if secret JWK exists
-  if (! oidc_jwk)
-  {
-    // Generate and save a new key
-    oidc_jwk = generate_jwk ();
-    oidc_directory = get_oidc_dir_path (cls);
-
-    // Create new oidc directory
-    if (GNUNET_OK != GNUNET_DISK_directory_create (oidc_directory))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  ("Failed to create directory `%s' for storing oidc data\n"),
-                  oidc_directory);
-    }
-    else
-    {
-      write_jwk_to_file (oidc_jwk_path, oidc_jwk);
-    }
-  }
-
-  // Convert secret JWK to public JWK
-  jose_jwk_pub (NULL, oidc_jwk);
-
-  // Encode JWK as string and return to API endpoint
-  oidc_jwk_pub_str = json_dumps (oidc_jwk, JSON_INDENT (1));
-  resp = GNUNET_REST_create_response (oidc_jwk_pub_str);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  json_decref (oidc_jwk);
-  GNUNET_free (oidc_jwk_pub_str);
-  GNUNET_free (oidc_jwk_pub_str);
-  cleanup_handle (handle);
-}
-
-/**
- * If listing is enabled, prints information about the egos.
- *
- * This function is initially called for all egos and then again
- * whenever a ego's identifier changes or if it is deleted.  At the
- * end of the initial pass over all egos, the function is once called
- * with 'NULL' for 'ego'. That does NOT mean that the callback won't
- * be invoked in the future or that there was an error.
- *
- * When used with 'GNUNET_IDENTITY_create' or 'GNUNET_IDENTITY_get', this
- * function is only called ONCE, and 'NULL' being passed in 'ego' does
- * indicate an error (for example because name is taken or no default value is
- * known).  If 'ego' is non-NULL and if '*ctx' is set in those callbacks, the
- * value WILL be passed to a subsequent call to the identity callback of
- * 'GNUNET_IDENTITY_connect' (if that one was not NULL).
- *
- * When an identity is renamed, this function is called with the
- * (known) ego but the NEW identifier.
- *
- * When an identity is deleted, this function is called with the
- * (known) ego and "NULL" for the 'identifier'.  In this case,
- * the 'ego' is henceforth invalid (and the 'ctx' should also be
- * cleaned up).
- *
- * @param cls closure
- * @param ego ego handle
- * @param ctx context for application to store data for this ego
- *                 (during the lifetime of this process, initially NULL)
- * @param identifier identifier assigned by the user for this ego,
- *                   NULL if the user just deleted the ego and it
- *                   must thus no longer be used
- */
-static void
-list_ego (void *cls,
-          struct GNUNET_IDENTITY_Ego *ego,
-          void **ctx,
-          const char *identifier)
-{
-  struct EgoEntry *ego_entry;
-  struct GNUNET_CRYPTO_PublicKey pk;
-
-  if (NULL == ego)
-  {
-    state = ID_REST_STATE_POST_INIT;
-    return;
-  }
-  if (ID_REST_STATE_INIT == state)
-
-  {
-    ego_entry = GNUNET_new (struct EgoEntry);
-    GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-    ego_entry->keystring = GNUNET_CRYPTO_public_key_to_string (&pk);
-    ego_entry->ego = ego;
-    ego_entry->identifier = GNUNET_strdup (identifier);
-    GNUNET_CONTAINER_DLL_insert_tail (ego_head,
-                                      ego_tail,
-                                      ego_entry);
-    return;
-  }
-  /* Ego renamed or added */
-  if (identifier != NULL)
-  {
-    for (ego_entry = ego_head; NULL != ego_entry;
-         ego_entry = ego_entry->next)
-    {
-      if (ego_entry->ego == ego)
-      {
-        /* Rename */
-        GNUNET_free (ego_entry->identifier);
-        ego_entry->identifier = GNUNET_strdup (identifier);
-        break;
-      }
-    }
-    if (NULL == ego_entry)
-    {
-      /* Add */
-      ego_entry = GNUNET_new (struct EgoEntry);
-      GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-      ego_entry->keystring = GNUNET_CRYPTO_public_key_to_string (&pk);
-      ego_entry->ego = ego;
-      ego_entry->identifier = GNUNET_strdup (identifier);
-      GNUNET_CONTAINER_DLL_insert_tail (ego_head,
-                                        ego_tail,
-                                        ego_entry);
-    }
-  }
-  else
-  {
-    /* Delete */
-    for (ego_entry = ego_head; NULL != ego_entry;
-         ego_entry = ego_entry->next)
-    {
-      if (ego_entry->ego == ego)
-        break;
-    }
-    if (NULL == ego_entry)
-      return; /* Not found */
-
-    GNUNET_CONTAINER_DLL_remove (ego_head,
-                                 ego_tail,
-                                 ego_entry);
-    GNUNET_free (ego_entry->identifier);
-    GNUNET_free (ego_entry->keystring);
-    GNUNET_free (ego_entry);
-    return;
-  }
-}
-
-
-static void
-oidc_config_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
-                      const char *url,
-                      void *cls)
-{
-  json_t *oidc_config;
-  json_t *auth_methods;
-  json_t *sig_algs;
-  json_t *scopes;
-  json_t *response_types;
-  json_t *sub_types;
-  json_t *claim_types;
-  char *oidc_config_str;
-  struct MHD_Response *resp;
-  struct RequestHandle *handle = cls;
-
-  oidc_config = json_object ();
-  // FIXME get from config?
-  json_object_set_new (oidc_config,
-                       "issuer", json_string ("http://localhost:7776"));
-  json_object_set_new (oidc_config,
-                       "authorization_endpoint",
-                       json_string ("https://api.reclaim/openid/authorize"));
-  json_object_set_new (oidc_config,
-                       "token_endpoint",
-                       json_string ("http://localhost:7776/openid/token"));
-  auth_methods = json_array ();
-  json_array_append_new (auth_methods,
-                         json_string ("client_secret_basic"));
-  json_array_append_new (auth_methods,
-                         json_string ("client_secret_post"));
-  json_object_set_new (oidc_config,
-                       "token_endpoint_auth_methods_supported",
-                       auth_methods);
-  sig_algs = json_array ();
-  json_array_append_new (sig_algs,
-                         json_string ("HS512"));
-  json_array_append_new (sig_algs,
-                         json_string ("RS256"));
-  json_object_set_new (oidc_config,
-                       "id_token_signing_alg_values_supported",
-                       sig_algs);
-  json_object_set_new (oidc_config,
-                       "jwks_uri",
-                       json_string ("http://localhost:7776/jwks.json"));
-  json_object_set_new (oidc_config,
-                       "userinfo_endpoint",
-                       json_string ("http://localhost:7776/openid/userinfo"));
-  scopes = json_array ();
-  json_array_append_new (scopes,
-                         json_string ("openid"));
-  json_array_append_new (scopes,
-                         json_string ("profile"));
-  json_array_append_new (scopes,
-                         json_string ("email"));
-  json_array_append_new (scopes,
-                         json_string ("address"));
-  json_array_append_new (scopes,
-                         json_string ("phone"));
-  json_object_set_new (oidc_config,
-                       "scopes_supported",
-                       scopes);
-  response_types = json_array ();
-  json_array_append_new (response_types,
-                         json_string ("code"));
-  json_object_set_new (oidc_config,
-                       "response_types_supported",
-                       response_types);
-  sub_types = json_array ();
-  json_array_append_new (sub_types,
-                         json_string ("public"));  /* no pairwise support */
-  json_object_set_new (oidc_config,
-                       "subject_types_supported",
-                       sub_types);
-  claim_types = json_array ();
-  json_array_append_new (claim_types,
-                         json_string ("normal"));
-  json_array_append_new (claim_types,
-                         json_string ("aggregated"));
-  json_object_set_new (oidc_config,
-                       "claim_types_supported",
-                       claim_types);
-  json_object_set_new (oidc_config,
-                       "claims_parameter_supported",
-                       json_boolean (1));
-  oidc_config_str = json_dumps (oidc_config, JSON_INDENT (1));
-  resp = GNUNET_REST_create_response (oidc_config_str);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  json_decref (oidc_config);
-  GNUNET_free (oidc_config_str);
-  cleanup_handle (handle);
-}
-
-
-/**
- * Respond to OPTIONS request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-oidc_config_cors (struct GNUNET_REST_RequestHandle *con_handle,
-                  const char *url,
-                  void *cls)
-{
-  struct MHD_Response *resp;
-  struct RequestHandle *handle = cls;
-
-  // For now, independent of path return all options
-  resp = GNUNET_REST_create_response (NULL);
-  GNUNET_assert (MHD_NO !=
-                 MHD_add_response_header (resp,
-                                          "Access-Control-Allow-Methods",
-                                          allow_methods));
-  GNUNET_assert (MHD_NO !=
-                 MHD_add_response_header (resp,
-                                          "Access-Control-Allow-Origin",
-                                          "*"));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  cleanup_handle (handle);
-  return;
-}
-
-
-static enum GNUNET_GenericReturnValue
-rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                               GNUNET_REST_ResultProcessor proc,
-                               void *proc_cls)
-{
-  struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
-  struct GNUNET_REST_RequestHandlerError err;
-  static const struct GNUNET_REST_RequestHandler handlers[] =
-  { { MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_AUTHORIZE, &authorize_endpoint },
-    { MHD_HTTP_METHOD_POST,
-      GNUNET_REST_API_NS_AUTHORIZE, &authorize_endpoint },   // url-encoded
-    { MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_LOGIN, &login_cont },
-    { MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_TOKEN, &token_endpoint },
-    { MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_USERINFO, &userinfo_endpoint },
-    { MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_USERINFO, &userinfo_endpoint },
-    { MHD_HTTP_METHOD_GET, GNUNET_REST_API_JWKS, &jwks_endpoint },
-    { MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_OIDC_CONFIG,
-      &oidc_config_endpoint },
-    { MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_OIDC_CONFIG,
-      &oidc_config_cors },
-    { MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_OIDC, &options_cont },
-    GNUNET_REST_HANDLER_END };
-
-  handle->oidc = GNUNET_new (struct OIDC_Variables);
-  if (NULL == OIDC_cookie_jar_map)
-    OIDC_cookie_jar_map = GNUNET_CONTAINER_multihashmap_create (10,
-                                                                GNUNET_NO);
-  if (NULL == oidc_code_cache)
-    oidc_code_cache = GNUNET_CONTAINER_multihashmap_create (10,
-                                                            GNUNET_NO);
-
-  handle->response_code = 0;
-  handle->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-  handle->proc_cls = proc_cls;
-  handle->proc = proc;
-  handle->rest_handle = rest_handle;
-  handle->url = GNUNET_strdup (rest_handle->url);
-  handle->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (handle->timeout, &do_timeout, handle);
-  GNUNET_CONTAINER_DLL_insert (requests_head,
-                               requests_tail,
-                               handle);
-  if (handle->url[strlen (handle->url) - 1] == '/')
-    handle->url[strlen (handle->url) - 1] = '\0';
-  if (GNUNET_NO ==
-      GNUNET_REST_handle_request (handle->rest_handle, handlers, &err, handle))
-    return GNUNET_NO;
-
-  return GNUNET_YES;
-}
-
-
-/**
-   * Entry point for the plugin.
-   *
-   * @param cls Config info
-   * @return NULL on error, otherwise the plugin context
-   */
-void *
-libgnunet_plugin_rest_openid_connect_init (void *cls)
-{
-  static struct Plugin plugin;
-  struct GNUNET_REST_Plugin *api;
-
-  cfg = cls;
-  if (NULL != plugin.cfg)
-    return NULL;     /* can only initialize once! */
-  memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
-  api = GNUNET_new (struct GNUNET_REST_Plugin);
-  api->cls = &plugin;
-  api->name = GNUNET_REST_API_NS_OIDC;
-  api->process_request = &rest_identity_process_request;
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &list_ego, NULL);
-  gns_handle = GNUNET_GNS_connect (cfg);
-  idp = GNUNET_RECLAIM_connect (cfg);
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg,
-                                                        "reclaim-rest-plugin",
-                                                        "OIDC_USERINFO_CONSUME_TIMEOUT",
-                                                        &consume_timeout))
-  {
-    consume_timeout = CONSUME_TIMEOUT;
-  }
-
-
-  state = ID_REST_STATE_INIT;
-  GNUNET_asprintf (&allow_methods,
-                   "%s, %s, %s, %s, %s",
-                   MHD_HTTP_METHOD_GET,
-                   MHD_HTTP_METHOD_POST,
-                   MHD_HTTP_METHOD_PUT,
-                   MHD_HTTP_METHOD_DELETE,
-                   MHD_HTTP_METHOD_OPTIONS);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              _ ("OpenID Connect REST API initialized\n"));
-  return api;
-}
-
-
-static int
-cleanup_hashmap (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  GNUNET_free (value);
-  return GNUNET_YES;
-}
-
-
-/**
-   * Exit point from the plugin.
-   *
-   * @param cls the plugin context (as returned by "init")
-   * @return always NULL
-   */
-void *
-libgnunet_plugin_rest_openid_connect_done (void *cls)
-{
-  struct GNUNET_REST_Plugin *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct EgoEntry *ego_entry;
-
-  plugin->cfg = NULL;
-  while (NULL != requests_head)
-    cleanup_handle (requests_head);
-  if (NULL != OIDC_cookie_jar_map)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (OIDC_cookie_jar_map,
-                                           &cleanup_hashmap,
-                                           NULL);
-    GNUNET_CONTAINER_multihashmap_destroy (OIDC_cookie_jar_map);
-  }
-  if (NULL != oidc_code_cache)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (oidc_code_cache,
-                                           &cleanup_hashmap,
-                                           NULL);
-    GNUNET_CONTAINER_multihashmap_destroy (oidc_code_cache);
-  }
-
-  GNUNET_free (allow_methods);
-  if (NULL != gns_handle)
-    GNUNET_GNS_disconnect (gns_handle);
-  if (NULL != identity_handle)
-    GNUNET_IDENTITY_disconnect (identity_handle);
-  if (NULL != idp)
-    GNUNET_RECLAIM_disconnect (idp);
-  while (NULL != (ego_entry = ego_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (ego_head,
-                                 ego_tail,
-                                 ego_entry);
-    GNUNET_free (ego_entry->identifier);
-    GNUNET_free (ego_entry->keystring);
-    GNUNET_free (ego_entry);
-  }
-  GNUNET_free (api);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "OpenID Connect REST plugin is finished\n");
-  return NULL;
-}
-
-
-/* end of plugin_rest_openid_connect.c */
diff --git a/src/reclaim/plugin_rest_pabc.c b/src/reclaim/plugin_rest_pabc.c
deleted file mode 100644
index 4b7d21df3..000000000
--- a/src/reclaim/plugin_rest_pabc.c
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @file reclaim/plugin_rest_pabc.c
- * @brief GNUnet pabc REST plugin
- *
- */
-#include "platform.h"
-#include "microhttpd.h"
-#include <inttypes.h>
-#include <jansson.h>
-#include <pabc/pabc.h>
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_rest_lib.h"
-#include "gnunet_rest_plugin.h"
-#include "gnunet_signatures.h"
-#include "pabc_helper.h"
-
-/**
- * REST root namespace
- */
-#define GNUNET_REST_API_NS_PABC "/pabc"
-
-/**
- * Credential request endpoint
- */
-#define GNUNET_REST_API_NS_PABC_CR "/pabc/cr"
-
-/**
- * The configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * HTTP methods allows for this plugin
- */
-static char *allow_methods;
-
-/**
- * @brief struct returned by the initialization function of the plugin
- */
-struct Plugin
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-
-struct RequestHandle
-{
-  /**
-   * DLL
-   */
-  struct RequestHandle *next;
-
-  /**
-   * DLL
-   */
-  struct RequestHandle *prev;
-
-  /**
-   * Rest connection
-   */
-  struct GNUNET_REST_RequestHandle *rest_handle;
-
-  /**
-   * Desired timeout for the lookup (default is no timeout).
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * ID of a task associated with the resolution process.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * The plugin result processor
-   */
-  GNUNET_REST_ResultProcessor proc;
-
-  /**
-   * The closure of the result processor
-   */
-  void *proc_cls;
-
-  /**
-   * The url
-   */
-  char *url;
-
-  /**
-   * Error response message
-   */
-  char *emsg;
-
-  /**
-   * Response code
-   */
-  int response_code;
-
-  /**
-   * Response object
-   */
-  json_t *resp_object;
-};
-
-/**
- * DLL
- */
-static struct RequestHandle *requests_head;
-
-/**
- * DLL
- */
-static struct RequestHandle *requests_tail;
-
-
-/**
- * Cleanup lookup handle
- * @param handle Handle to clean up
- */
-static void
-cleanup_handle (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
-  if (NULL != handle->resp_object)
-    json_decref (handle->resp_object);
-  if (NULL != handle->timeout_task)
-    GNUNET_SCHEDULER_cancel (handle->timeout_task);
-  if (NULL != handle->url)
-    GNUNET_free (handle->url);
-  if (NULL != handle->emsg)
-    GNUNET_free (handle->emsg);
-  GNUNET_CONTAINER_DLL_remove (requests_head,
-                               requests_tail,
-                               handle);
-  GNUNET_free (handle);
-}
-
-
-/**
- * Task run on error, sends error message.  Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_error (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *json_error;
-
-  GNUNET_asprintf (&json_error, "{ \"error\" : \"%s\" }", handle->emsg);
-  if (0 == handle->response_code)
-  {
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-  }
-  resp = GNUNET_REST_create_response (json_error);
-  MHD_add_response_header (resp, "Content-Type", "application/json");
-  handle->proc (handle->proc_cls, resp, handle->response_code);
-  cleanup_handle (handle);
-  GNUNET_free (json_error);
-}
-
-
-/**
- * Task run on timeout, sends error message.  Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_timeout (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  handle->timeout_task = NULL;
-  do_error (handle);
-}
-
-
-static void
-return_response (void *cls)
-{
-  char *result_str;
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-
-  result_str = json_dumps (handle->resp_object, 0);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
-  resp = GNUNET_REST_create_response (result_str);
-  MHD_add_response_header (resp, "Access-Control-Allow-Methods", allow_methods);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_free (result_str);
-  cleanup_handle (handle);
-}
-
-
-static enum pabc_status
-set_attributes_from_idtoken (const struct pabc_context *ctx,
-                             const struct pabc_public_parameters *pp,
-                             struct pabc_user_context *usr_ctx,
-                             const char *id_token)
-{
-  json_t *payload_json;
-  json_t *value;
-  json_error_t json_err;
-  const char *key;
-  const char *jwt_body;
-  char *decoded_jwt;
-  char delim[] = ".";
-  char *jwt_string;
-  const char *pabc_key;
-  enum pabc_status status;
-
-  // FIXME parse JWT
-  jwt_string = GNUNET_strndup (id_token, strlen (id_token));
-  jwt_body = strtok (jwt_string, delim);
-  jwt_body = strtok (NULL, delim);
-  GNUNET_STRINGS_base64url_decode (jwt_body, strlen (jwt_body),
-                                   (void **) &decoded_jwt);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Decoded ID Token: %s\n", decoded_jwt);
-  payload_json = json_loads (decoded_jwt, JSON_DECODE_ANY, &json_err);
-  GNUNET_free (decoded_jwt);
-
-  json_object_foreach (payload_json, key, value)
-  {
-    pabc_key = key;
-    if (0 == strcmp ("iss", key))
-      pabc_key = "issuer"; // rename
-    if (0 == strcmp ("sub", key))
-      pabc_key = "subject"; // rename
-    if (0 == strcmp ("jti", key))
-      continue;
-    if (0 == strcmp ("exp", key))
-      pabc_key = "expiration"; // rename
-    if (0 == strcmp ("iat", key))
-      continue;
-    if (0 == strcmp ("nbf", key))
-      continue;
-    if (0 == strcmp ("aud", key))
-      continue;
-    char *tmp_val;
-    if (json_is_string (value))
-      tmp_val = GNUNET_strdup (json_string_value (value));
-    else
-      tmp_val = json_dumps (value, JSON_ENCODE_ANY);
-    if (NULL == tmp_val)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unable to encode JSON value for `%s'\n", key);
-      continue;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Setting `%s' to `%s'\n", key, tmp_val);
-    status = pabc_set_attribute_value_by_name (ctx, pp, usr_ctx,
-                                               pabc_key,
-                                               tmp_val);
-    GNUNET_free (tmp_val);
-    if (PABC_OK != status)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to set attribute `%s'.\n", key);
-    }
-  }
-  GNUNET_free (jwt_string);
-  return PABC_OK;
-}
-
-
-static enum GNUNET_GenericReturnValue
-setup_new_user_context (struct pabc_context *ctx,
-                        struct pabc_public_parameters *pp,
-                        struct pabc_user_context **usr_ctx)
-{
-  if (PABC_OK != pabc_new_user_context (ctx, pp, usr_ctx))
-    return GNUNET_SYSERR;
-
-  if (PABC_OK != pabc_populate_user_context (ctx, *usr_ctx))
-  {
-    pabc_free_user_context (ctx, pp, usr_ctx);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-static void
-cr_cont (struct GNUNET_REST_RequestHandle *con_handle,
-         const char *url,
-         void *cls)
-{
-  struct RequestHandle *handle = cls;
-  char term_data[handle->rest_handle->data_size + 1];
-  char *response_str;
-  json_t *data_json;
-  json_t *nonce_json;
-  json_t *pp_json;
-  json_t *idtoken_json;
-  json_t *iss_json;
-  json_t *identity_json;
-  json_error_t err;
-  struct pabc_public_parameters *pp = NULL;
-  struct pabc_context *ctx = NULL;
-  struct pabc_user_context *usr_ctx = NULL;
-  struct pabc_credential_request *cr = NULL;
-  struct pabc_nonce *nonce = NULL;
-  enum pabc_status status;
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Credential request...\n");
-
-  if (0 >= handle->rest_handle->data_size)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy (term_data,
-                 handle->rest_handle->data,
-                 handle->rest_handle->data_size);
-  data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
-  if (NULL == data_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse %s\n", term_data);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  if (! json_is_object (data_json))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse %s\n", term_data);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  nonce_json = json_object_get (data_json, "nonce");
-  if (NULL == nonce_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse nonce\n");
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  iss_json = json_object_get (data_json, "issuer");
-  if (NULL == iss_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse issuer\n");
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity_json = json_object_get (data_json, "identity");
-  if (NULL == identity_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse identity\n");
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  idtoken_json = json_object_get (data_json, "id_token");
-  if (NULL == idtoken_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse id_token\n");
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  pp_json = json_object_get (data_json, "public_params");
-  if (NULL == pp_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse public parameters\n");
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  PABC_ASSERT (pabc_new_ctx (&ctx));
-  char *pp_str = json_dumps (pp_json, JSON_ENCODE_ANY);
-  status = pabc_decode_and_new_public_parameters (ctx,
-                                                  &pp,
-                                                  pp_str);
-  char *ppid;
-  GNUNET_assert (PABC_OK == pabc_cred_get_ppid_from_pp (pp_str, &ppid));
-  GNUNET_free (pp_str);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to read public parameters: %s\n",
-                pp_str);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  // (Over)write parameters
-  status = PABC_write_public_parameters (json_string_value (iss_json),
-                                         pp);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to write public parameters.\n");
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  status = PABC_read_usr_ctx (json_string_value (identity_json),
-                              json_string_value (iss_json),
-                              ctx, pp, &usr_ctx);
-  if (PABC_OK != status)
-  {
-    if (GNUNET_OK != setup_new_user_context (ctx, pp, &usr_ctx))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup user context.\n");
-      pabc_free_public_parameters (ctx, &pp);
-      json_decref (data_json);
-      GNUNET_SCHEDULER_add_now (&do_error, handle);
-      return;
-    }
-    PABC_write_usr_ctx (json_string_value (identity_json),
-                        json_string_value (iss_json),
-                        ctx, pp, usr_ctx);
-  }
-
-  // Set attributes from JWT to context
-  status = set_attributes_from_idtoken (ctx,
-                                        pp,
-                                        usr_ctx,
-                                        json_string_value (idtoken_json));
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to set attributes.\n");
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-
-  // nonce
-  status = pabc_new_nonce (ctx, &nonce);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to allocate nonce.\n");
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  char *nonce_str = json_dumps (nonce_json, JSON_ENCODE_ANY);
-  status = pabc_decode_nonce (ctx, nonce, nonce_str);
-  if (status != PABC_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to decode nonce.\n");
-    pabc_free_nonce (ctx, &nonce);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  // cr
-  status = pabc_new_credential_request (ctx, pp, &cr);
-  if (PABC_OK != status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to allocate cr.\n");
-    pabc_free_nonce (ctx, &nonce);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  status = pabc_gen_credential_request (ctx, pp, usr_ctx, nonce, cr);
-  if (PABC_OK != status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to generate cr.\n");
-    pabc_free_nonce (ctx, &nonce);
-    pabc_free_credential_request (ctx, pp, &cr);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  handle->resp_object = json_object ();
-  GNUNET_assert (PABC_OK == pabc_cred_encode_cr (ctx, pp, cr,
-                                                 json_string_value (
-                                                   identity_json),
-                                                 ppid, &response_str));
-  if (PABC_OK != status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to serialize cr.\n");
-    pabc_free_nonce (ctx, &nonce);
-    pabc_free_credential_request (ctx, pp, &cr);
-    pabc_free_user_context (ctx, pp, &usr_ctx);
-    pabc_free_public_parameters (ctx, &pp);
-    json_decref (data_json);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  json_decref (handle->resp_object);
-  handle->resp_object = json_loads (response_str, JSON_DECODE_ANY, &err);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s\n", response_str);
-  GNUNET_free (response_str);
-
-  // clean up
-  pabc_free_nonce (ctx, &nonce);
-  pabc_free_credential_request (ctx, pp, &cr);
-  pabc_free_user_context (ctx, pp, &usr_ctx);
-  pabc_free_public_parameters (ctx, &pp);
-  GNUNET_SCHEDULER_add_now (&return_response, handle);
-  json_decref (data_json);
-}
-
-
-/**
- * Respond to OPTIONS request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-options_cont (struct GNUNET_REST_RequestHandle *con_handle,
-              const char *url,
-              void *cls)
-{
-  struct MHD_Response *resp;
-  struct RequestHandle *handle = cls;
-
-  // For now, independent of path return all options
-  resp = GNUNET_REST_create_response (NULL);
-  MHD_add_response_header (resp, "Access-Control-Allow-Methods", allow_methods);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  cleanup_handle (handle);
-  return;
-}
-
-
-static enum GNUNET_GenericReturnValue
-rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                               GNUNET_REST_ResultProcessor proc,
-                               void *proc_cls)
-{
-  struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
-  struct GNUNET_REST_RequestHandlerError err;
-  static const struct GNUNET_REST_RequestHandler handlers[] = {
-    {MHD_HTTP_METHOD_POST,
-     GNUNET_REST_API_NS_PABC_CR, &cr_cont },
-    { MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_PABC, &options_cont },
-    GNUNET_REST_HANDLER_END
-  };
-
-  handle->response_code = 0;
-  handle->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-  handle->proc_cls = proc_cls;
-  handle->proc = proc;
-  handle->rest_handle = rest_handle;
-
-  handle->url = GNUNET_strdup (rest_handle->url);
-  if (handle->url[strlen (handle->url) - 1] == '/')
-    handle->url[strlen (handle->url) - 1] = '\0';
-  handle->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (handle->timeout, &do_timeout, handle);
-  GNUNET_CONTAINER_DLL_insert (requests_head,
-                               requests_tail,
-                               handle);
-  if (GNUNET_NO ==
-      GNUNET_REST_handle_request (handle->rest_handle, handlers, &err, handle))
-  {
-    cleanup_handle (handle);
-    return GNUNET_NO;
-  }
-
-  return GNUNET_YES;
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls Config info
- * @return NULL on error, otherwise the plugin context
- */
-void *
-libgnunet_plugin_rest_pabc_init (void *cls)
-{
-  static struct Plugin plugin;
-  struct GNUNET_REST_Plugin *api;
-
-  cfg = cls;
-  if (NULL != plugin.cfg)
-    return NULL; /* can only initialize once! */
-  memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
-  api = GNUNET_new (struct GNUNET_REST_Plugin);
-  api->cls = &plugin;
-  api->name = GNUNET_REST_API_NS_PABC;
-  api->process_request = &rest_identity_process_request;
-  GNUNET_asprintf (&allow_methods,
-                   "%s, %s",
-                   MHD_HTTP_METHOD_POST,
-                   MHD_HTTP_METHOD_OPTIONS);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              _ ("Identity Provider REST API initialized\n"));
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the plugin context (as returned by "init")
- * @return always NULL
- */
-void *
-libgnunet_plugin_rest_reclaim_done (void *cls)
-{
-  struct GNUNET_REST_Plugin *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct RequestHandle *request;
-
-  plugin->cfg = NULL;
-  while (NULL != (request = requests_head))
-    do_error (request);
-
-  GNUNET_free (allow_methods);
-  GNUNET_free (api);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "PABC REST plugin is finished\n");
-  return NULL;
-}
-
-
-/* end of plugin_rest_reclaim.c */
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
deleted file mode 100644
index b2586109a..000000000
--- a/src/reclaim/plugin_rest_reclaim.c
+++ /dev/null
@@ -1,1564 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @author Philippe Buschmann
- * @file reclaim/plugin_rest_reclaim.c
- * @brief GNUnet reclaim REST plugin
- *
- */
-#include "platform.h"
-#include "microhttpd.h"
-#include <inttypes.h>
-#include <jansson.h>
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "gnunet_rest_lib.h"
-#include "gnunet_rest_plugin.h"
-#include "gnunet_signatures.h"
-#include "json_reclaim.h"
-/**
- * REST root namespace
- */
-#define GNUNET_REST_API_NS_RECLAIM "/reclaim"
-
-/**
- * Attribute namespace
- */
-#define GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES "/reclaim/attributes"
-
-/**
- * Credential namespace
- */
-#define GNUNET_REST_API_NS_RECLAIM_CREDENTIAL "/reclaim/credential"
-
-/**
- * Ticket namespace
- */
-#define GNUNET_REST_API_NS_IDENTITY_TICKETS "/reclaim/tickets"
-
-/**
- * Revoke namespace
- */
-#define GNUNET_REST_API_NS_IDENTITY_REVOKE "/reclaim/revoke"
-
-/**
- * Revoke namespace
- */
-#define GNUNET_REST_API_NS_IDENTITY_CONSUME "/reclaim/consume"
-
-/**
- * State while collecting all egos
- */
-#define ID_REST_STATE_INIT 0
-
-/**
- * Done collecting egos
- */
-#define ID_REST_STATE_POST_INIT 1
-
-/**
- * The configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * HTTP methods allows for this plugin
- */
-static char *allow_methods;
-
-/**
- * Ego list
- */
-static struct EgoEntry *ego_head;
-
-/**
- * Ego list
- */
-static struct EgoEntry *ego_tail;
-
-/**
- * The processing state
- */
-static int state;
-
-/**
- * Handle to Identity service.
- */
-static struct GNUNET_IDENTITY_Handle *identity_handle;
-
-/**
- * Identity Provider
- */
-static struct GNUNET_RECLAIM_Handle *idp;
-
-/**
- * @brief struct returned by the initialization function of the plugin
- */
-struct Plugin
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-/**
- * The ego list
- */
-struct EgoEntry
-{
-  /**
-   * DLL
-   */
-  struct EgoEntry *next;
-
-  /**
-   * DLL
-   */
-  struct EgoEntry *prev;
-
-  /**
-   * Ego Identifier
-   */
-  char *identifier;
-
-  /**
-   * Public key string
-   */
-  char *keystring;
-
-  /**
-   * The Ego
-   */
-  struct GNUNET_IDENTITY_Ego *ego;
-};
-
-
-struct RequestHandle
-{
-  /**
-   * DLL
-   */
-  struct RequestHandle *next;
-
-  /**
-   * DLL
-   */
-  struct RequestHandle *prev;
-
-  /**
-   * Selected ego
-   */
-  struct EgoEntry *ego_entry;
-
-  /**
-   * Pointer to ego private key
-   */
-  struct GNUNET_CRYPTO_PrivateKey priv_key;
-
-  /**
-   * Rest connection
-   */
-  struct GNUNET_REST_RequestHandle *rest_handle;
-
-  /**
-   * Attribute claim list
-   */
-  struct GNUNET_RECLAIM_AttributeList *attr_list;
-
-  /**
-   * IDENTITY Operation
-   */
-  struct GNUNET_IDENTITY_Operation *op;
-
-  /**
-   * Idp Operation
-   */
-  struct GNUNET_RECLAIM_Operation *idp_op;
-
-  /**
-   * Attribute iterator
-   */
-  struct GNUNET_RECLAIM_AttributeIterator *attr_it;
-
-  /**
-   * Attribute iterator
-   */
-  struct GNUNET_RECLAIM_CredentialIterator *cred_it;
-
-  /**
-   * Ticket iterator
-   */
-  struct GNUNET_RECLAIM_TicketIterator *ticket_it;
-
-  /**
-   * A ticket
-   */
-  struct GNUNET_RECLAIM_Ticket ticket;
-
-  /**
-   * Desired timeout for the lookup (default is no timeout).
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * ID of a task associated with the resolution process.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * The plugin result processor
-   */
-  GNUNET_REST_ResultProcessor proc;
-
-  /**
-   * The closure of the result processor
-   */
-  void *proc_cls;
-
-  /**
-   * The url
-   */
-  char *url;
-
-  /**
-   * Error response message
-   */
-  char *emsg;
-
-  /**
-   * Response code
-   */
-  int response_code;
-
-  /**
-   * Response object
-   */
-  json_t *resp_object;
-};
-
-/**
- * DLL
- */
-static struct RequestHandle *requests_head;
-
-/**
- * DLL
- */
-static struct RequestHandle *requests_tail;
-
-
-/**
- * Cleanup lookup handle
- * @param handle Handle to clean up
- */
-static void
-cleanup_handle (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
-  if (NULL != handle->resp_object)
-    json_decref (handle->resp_object);
-  if (NULL != handle->timeout_task)
-    GNUNET_SCHEDULER_cancel (handle->timeout_task);
-  if (NULL != handle->attr_it)
-    GNUNET_RECLAIM_get_attributes_stop (handle->attr_it);
-  if (NULL != handle->cred_it)
-    GNUNET_RECLAIM_get_credentials_stop (handle->cred_it);
-  if (NULL != handle->ticket_it)
-    GNUNET_RECLAIM_ticket_iteration_stop (handle->ticket_it);
-  if (NULL != handle->url)
-    GNUNET_free (handle->url);
-  if (NULL != handle->emsg)
-    GNUNET_free (handle->emsg);
-  if (NULL != handle->attr_list)
-    GNUNET_RECLAIM_attribute_list_destroy (handle->attr_list);
-  GNUNET_CONTAINER_DLL_remove (requests_head,
-                               requests_tail,
-                               handle);
-  GNUNET_free (handle);
-}
-
-
-/**
- * Task run on error, sends error message.  Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_error (void *cls)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  char *json_error;
-
-  GNUNET_asprintf (&json_error, "{ \"error\" : \"%s\" }", handle->emsg);
-  if (0 == handle->response_code)
-  {
-    handle->response_code = MHD_HTTP_BAD_REQUEST;
-  }
-  resp = GNUNET_REST_create_response (json_error);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp, "Content-Type", "application/json"));
-  handle->proc (handle->proc_cls, resp, handle->response_code);
-  cleanup_handle (handle);
-  GNUNET_free (json_error);
-}
-
-
-/**
- * Task run on timeout, sends error message.  Cleans up everything.
- *
- * @param cls the `struct RequestHandle`
- */
-static void
-do_timeout (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  handle->timeout_task = NULL;
-  do_error (handle);
-}
-
-
-static void
-collect_error_cb (void *cls)
-{
-  GNUNET_SCHEDULER_add_now (&do_error, cls);
-}
-
-
-static void
-finished_cont (void *cls, int32_t success, const char *emsg)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-
-  handle->idp_op = NULL;
-  if (GNUNET_OK != success)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  resp = GNUNET_REST_create_response (emsg);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Content-Type",
-                                                    "application/json"));
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Access-Control-Allow-Methods",
-                                                    allow_methods));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_SCHEDULER_add_now (&cleanup_handle, handle);
-}
-
-
-static void
-delete_finished_cb (void *cls, int32_t success, const char *emsg)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-
-  if (GNUNET_OK != success)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  resp = GNUNET_REST_create_response (emsg);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                    "Access-Control-Allow-Methods",
-                                                    allow_methods));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_SCHEDULER_add_now (&cleanup_handle, handle);
-}
-
-
-/**
- * Return attributes for identity
- *
- * @param cls the request handle
- */
-static void
-return_response (void *cls)
-{
-  char *result_str;
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-
-  result_str = json_dumps (handle->resp_object, 0);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
-  resp = GNUNET_REST_create_response (result_str);
-  GNUNET_assert (MHD_NO !=
-                 MHD_add_response_header (resp,
-                                          "Access-Control-Allow-Methods",
-                                          allow_methods));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_free (result_str);
-  cleanup_handle (handle);
-}
-
-
-static void
-collect_finished_cb (void *cls)
-{
-  struct RequestHandle *handle = cls;
-
-  // Done
-  handle->attr_it = NULL;
-  handle->cred_it = NULL;
-  handle->ticket_it = NULL;
-  GNUNET_SCHEDULER_add_now (&return_response, handle);
-}
-
-
-/**
- * Collect all attributes for an ego
- *
- */
-static void
-ticket_collect (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket)
-{
-  json_t *json_resource;
-  struct RequestHandle *handle = cls;
-  json_t *value;
-  char *tmp;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding ticket\n");
-  tmp = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd));
-  json_resource = json_object ();
-  GNUNET_free (tmp);
-  json_array_append (handle->resp_object, json_resource);
-
-  tmp =
-    GNUNET_STRINGS_data_to_string_alloc (&ticket->identity,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  value = json_string (tmp);
-  json_object_set_new (json_resource, "issuer", value);
-  GNUNET_free (tmp);
-  tmp =
-    GNUNET_STRINGS_data_to_string_alloc (&ticket->audience,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  value = json_string (tmp);
-  json_object_set_new (json_resource, "audience", value);
-  GNUNET_free (tmp);
-  tmp = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd));
-  value = json_string (tmp);
-  json_object_set_new (json_resource, "rnd", value);
-  GNUNET_free (tmp);
-  GNUNET_RECLAIM_ticket_iteration_next (handle->ticket_it);
-}
-
-
-static void
-add_credential_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                     const char *url,
-                     void *cls)
-{
-  struct RequestHandle *handle = cls;
-  const struct GNUNET_CRYPTO_PrivateKey *identity_priv;
-  const char *identity;
-  struct EgoEntry *ego_entry;
-  struct GNUNET_RECLAIM_Credential *attribute;
-  struct GNUNET_TIME_Relative exp;
-  char term_data[handle->rest_handle->data_size + 1];
-  json_t *data_json;
-  json_error_t err;
-  struct GNUNET_JSON_Specification attrspec[] =
-  { GNUNET_RECLAIM_JSON_spec_credential (&attribute),
-    GNUNET_JSON_spec_end () };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding an credential for %s.\n",
-              handle->url);
-  if (strlen (GNUNET_REST_API_NS_RECLAIM_CREDENTIAL) >= strlen (
-        handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity = handle->url + strlen (
-    GNUNET_REST_API_NS_RECLAIM_CREDENTIAL) + 1;
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-
-  if (NULL == ego_entry)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Identity unknown (%s)\n", identity);
-    return;
-  }
-  identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-
-  if (0 >= handle->rest_handle->data_size)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy (term_data,
-                 handle->rest_handle->data,
-                 handle->rest_handle->data_size);
-  data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
-  if (GNUNET_OK != GNUNET_JSON_parse (data_json, attrspec, NULL, NULL))
-  {
-    json_decref (data_json);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse JSON from %s\n",
-                term_data);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  json_decref (data_json);
-  if (NULL == attribute)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse credential from %s\n",
-                term_data);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  /**
-   * New ID for attribute
-   */
-  if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&attribute->id))
-    GNUNET_RECLAIM_id_generate (&attribute->id);
-  exp = GNUNET_TIME_UNIT_HOURS;
-  handle->idp_op = GNUNET_RECLAIM_credential_store (idp,
-                                                    identity_priv,
-                                                    attribute,
-                                                    &exp,
-                                                    &finished_cont,
-                                                    handle);
-  GNUNET_JSON_parse_free (attrspec);
-}
-
-
-/**
- * Collect all credentials for an ego
- *
- */
-static void
-cred_collect (void *cls,
-              const struct GNUNET_CRYPTO_PublicKey *identity,
-              const struct GNUNET_RECLAIM_Credential *cred)
-{
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_AttributeList *attrs;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_TIME_Absolute exp;
-  json_t *attr_obj;
-  json_t *cred_obj;
-  const char *type;
-  char *tmp_value;
-  char *id_str;
-  char *issuer;
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding credential: %s\n",
-              cred->name);
-  attrs = GNUNET_RECLAIM_credential_get_attributes (cred);
-  issuer = GNUNET_RECLAIM_credential_get_issuer (cred);
-  tmp_value = GNUNET_RECLAIM_credential_value_to_string (cred->type,
-                                                         cred->data,
-                                                         cred->data_size);
-  cred_obj = json_object ();
-  json_object_set_new (cred_obj, "value", json_string (tmp_value));
-  json_object_set_new (cred_obj, "name", json_string (cred->name));
-  type = GNUNET_RECLAIM_credential_number_to_typename (cred->type);
-  json_object_set_new (cred_obj, "type", json_string (type));
-  if (NULL != issuer)
-  {
-    json_object_set_new (cred_obj, "issuer", json_string (issuer));
-    GNUNET_free (issuer);
-  }
-  if (GNUNET_OK == GNUNET_RECLAIM_credential_get_expiration (cred,
-                                                             &exp))
-  {
-    json_object_set_new (cred_obj, "expiration", json_integer (
-                           exp.abs_value_us));
-  }
-  id_str = GNUNET_STRINGS_data_to_string_alloc (&cred->id,
-                                                sizeof(cred->id));
-  json_object_set_new (cred_obj, "id", json_string (id_str));
-  GNUNET_free (tmp_value);
-  GNUNET_free (id_str);
-  if (NULL != attrs)
-  {
-    json_t *attr_arr = json_array ();
-    for (ale = attrs->list_head; NULL != ale; ale = ale->next)
-    {
-      tmp_value =
-        GNUNET_RECLAIM_attribute_value_to_string (ale->attribute->type,
-                                                  ale->attribute->data,
-                                                  ale->attribute->data_size);
-      attr_obj = json_object ();
-      json_object_set_new (attr_obj, "value", json_string (tmp_value));
-      json_object_set_new (attr_obj, "name", json_string (
-                             ale->attribute->name));
-
-      json_object_set_new (attr_obj, "flag", json_string ("1")); // FIXME
-      type = GNUNET_RECLAIM_attribute_number_to_typename (ale->attribute->type);
-      json_object_set_new (attr_obj, "type", json_string (type));
-      json_object_set_new (attr_obj, "id", json_string (""));
-      json_object_set_new (attr_obj, "credential", json_string (""));
-      json_array_append_new (attr_arr, attr_obj);
-      GNUNET_free (tmp_value);
-    }
-    json_object_set_new (cred_obj, "attributes", attr_arr);
-  }
-  json_array_append_new (handle->resp_object, cred_obj);
-  if (NULL != attrs)
-    GNUNET_RECLAIM_attribute_list_destroy (attrs);
-  GNUNET_RECLAIM_get_credentials_next (handle->cred_it);
-}
-
-
-/**
- * Lists credential for identity request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-list_credential_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                      const char *url,
-                      void *cls)
-{
-  struct RequestHandle *handle = cls;
-  const struct GNUNET_CRYPTO_PrivateKey *priv_key;
-  struct EgoEntry *ego_entry;
-  char *identity;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting credentials for %s.\n",
-              handle->url);
-  if (strlen (GNUNET_REST_API_NS_RECLAIM_CREDENTIAL) >= strlen (
-        handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity = handle->url + strlen (
-    GNUNET_REST_API_NS_RECLAIM_CREDENTIAL) + 1;
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-  handle->resp_object = json_array ();
-
-
-  if (NULL == ego_entry)
-  {
-    // Done
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego %s not found.\n", identity);
-    GNUNET_SCHEDULER_add_now (&return_response, handle);
-    return;
-  }
-  priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  handle->cred_it = GNUNET_RECLAIM_get_credentials_start (idp,
-                                                          priv_key,
-                                                          &collect_error_cb,
-                                                          handle,
-                                                          &cred_collect,
-                                                          handle,
-                                                          &
-                                                          collect_finished_cb,
-                                                          handle);
-}
-
-
-/**
- * Deletes credential from an identity
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-delete_credential_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                        const char *url,
-                        void *cls)
-{
-  struct RequestHandle *handle = cls;
-  const struct GNUNET_CRYPTO_PrivateKey *priv_key;
-  struct GNUNET_RECLAIM_Credential attr;
-  struct EgoEntry *ego_entry;
-  char *identity_id_str;
-  char *identity;
-  char *id;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting credential.\n");
-  if (strlen (GNUNET_REST_API_NS_RECLAIM_CREDENTIAL) >= strlen (
-        handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity_id_str =
-    strdup (handle->url + strlen (
-              GNUNET_REST_API_NS_RECLAIM_CREDENTIAL) + 1);
-  identity = strtok (identity_id_str, "/");
-  id = strtok (NULL, "/");
-  if ((NULL == identity) || (NULL == id))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed request.\n");
-    GNUNET_free (identity_id_str);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-  handle->resp_object = json_array ();
-  if (NULL == ego_entry)
-  {
-    // Done
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego %s not found.\n", identity);
-    GNUNET_free (identity_id_str);
-    GNUNET_SCHEDULER_add_now (&return_response, handle);
-    return;
-  }
-  priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  memset (&attr, 0, sizeof(struct GNUNET_RECLAIM_Credential));
-  GNUNET_STRINGS_string_to_data (id, strlen (id), &attr.id, sizeof(attr.id));
-  attr.name = "";
-  handle->idp_op = GNUNET_RECLAIM_credential_delete (idp,
-                                                     priv_key,
-                                                     &attr,
-                                                     &delete_finished_cb,
-                                                     handle);
-  GNUNET_free (identity_id_str);
-}
-
-
-/**
- * List tickets for identity request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-list_tickets_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                   const char *url,
-                   void *cls)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *priv_key;
-  struct RequestHandle *handle = cls;
-  struct EgoEntry *ego_entry;
-  char *identity;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting tickets for %s.\n",
-              handle->url);
-  if (strlen (GNUNET_REST_API_NS_IDENTITY_TICKETS) >= strlen (handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity = handle->url + strlen (GNUNET_REST_API_NS_IDENTITY_TICKETS) + 1;
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-  handle->resp_object = json_array ();
-
-  if (NULL == ego_entry)
-  {
-    // Done
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego %s not found.\n", identity);
-    GNUNET_SCHEDULER_add_now (&return_response, handle);
-    return;
-  }
-  priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  handle->ticket_it =
-    GNUNET_RECLAIM_ticket_iteration_start (idp,
-                                           priv_key,
-                                           &collect_error_cb,
-                                           handle,
-                                           &ticket_collect,
-                                           handle,
-                                           &collect_finished_cb,
-                                           handle);
-}
-
-
-static void
-add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                    const char *url,
-                    void *cls)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *identity_priv;
-  const char *identity;
-  struct RequestHandle *handle = cls;
-  struct EgoEntry *ego_entry;
-  struct GNUNET_RECLAIM_Attribute *attribute;
-  struct GNUNET_TIME_Relative exp;
-  char term_data[handle->rest_handle->data_size + 1];
-  json_t *data_json;
-  json_error_t err;
-  struct GNUNET_JSON_Specification attrspec[] =
-  { GNUNET_RECLAIM_JSON_spec_attribute (&attribute), GNUNET_JSON_spec_end () };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding an attribute for %s.\n",
-              handle->url);
-  if (strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) >= strlen (handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity = handle->url + strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) + 1;
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-
-  if (NULL == ego_entry)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Identity unknown (%s)\n", identity);
-    return;
-  }
-  identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-
-  if (0 >= handle->rest_handle->data_size)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy (term_data,
-                 handle->rest_handle->data,
-                 handle->rest_handle->data_size);
-  data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_JSON_parse (data_json, attrspec, NULL, NULL));
-  json_decref (data_json);
-  if (NULL == attribute)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse attribute from %s\n",
-                term_data);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  /**
-   * New ID for attribute
-   */
-  if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&attribute->id))
-    GNUNET_RECLAIM_id_generate (&attribute->id);
-  exp = GNUNET_TIME_UNIT_HOURS;
-  handle->idp_op = GNUNET_RECLAIM_attribute_store (idp,
-                                                   identity_priv,
-                                                   attribute,
-                                                   &exp,
-                                                   &finished_cont,
-                                                   handle);
-  GNUNET_JSON_parse_free (attrspec);
-}
-
-
-/**
- * Parse a JWT and return the respective claim value as Attribute
- *
- * @param cred the jwt credential
- * @param claim the name of the claim in the JWT
- *
- * @return a GNUNET_RECLAIM_Attribute, containing the new value
- */
-struct GNUNET_RECLAIM_Attribute *
-parse_jwt (const struct GNUNET_RECLAIM_Credential *cred,
-           const char *claim)
-{
-  char *jwt_string;
-  struct GNUNET_RECLAIM_Attribute *attr;
-  char delim[] = ".";
-  const char *type_str = NULL;
-  const char *val_str = NULL;
-  char *data;
-  size_t data_size;
-  uint32_t type;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Parsing JWT attributes.\n");
-  char *decoded_jwt;
-  json_t *json_val;
-  json_error_t *json_err = NULL;
-
-  jwt_string = GNUNET_RECLAIM_credential_value_to_string (cred->type,
-                                                          cred->data,
-                                                          cred->data_size);
-  char *jwt_body = strtok (jwt_string, delim);
-  jwt_body = strtok (NULL, delim);
-  GNUNET_STRINGS_base64_decode (jwt_body, strlen (jwt_body),
-                                (void **) &decoded_jwt);
-  json_val = json_loads (decoded_jwt, JSON_DECODE_ANY, json_err);
-  const char *key;
-  json_t *value;
-  json_object_foreach (json_val, key, value) {
-    if (0 == strcasecmp (key,claim))
-    {
-      val_str = json_dumps (value, JSON_ENCODE_ANY);
-    }
-  }
-  type_str = "String";
-  type = GNUNET_RECLAIM_attribute_typename_to_number (type_str);
-  if (GNUNET_SYSERR == GNUNET_RECLAIM_attribute_string_to_value (type,val_str,
-                                                                 (void **) &data,
-                                                                 &data_size))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Attribute value from JWT Parser invalid!\n");
-    GNUNET_RECLAIM_attribute_string_to_value (type,
-                                              "Error: Referenced Claim Name not Found",
-                                              (void **) &data,
-                                              &data_size);
-    attr = GNUNET_RECLAIM_attribute_new (claim, &cred->id,
-                                         type, data, data_size);
-    attr->id = cred->id;
-    attr->flag = 1;
-  }
-  else
-  {
-    attr = GNUNET_RECLAIM_attribute_new (claim, &cred->id,
-                                         type, data, data_size);
-    attr->id = cred->id;
-    attr->flag = 1;
-  }
-  return attr;
-}
-
-
-/**
- * Collect all attributes for an ego
- *
- */
-static void
-attr_collect (void *cls,
-              const struct GNUNET_CRYPTO_PublicKey *identity,
-              const struct GNUNET_RECLAIM_Attribute *attr)
-{
-  struct RequestHandle *handle = cls;
-  json_t *attr_obj;
-  const char *type;
-  char *id_str;
-
-  char *tmp_value;
-  tmp_value = GNUNET_RECLAIM_attribute_value_to_string (attr->type,
-                                                        attr->data,
-                                                        attr->data_size);
-  attr_obj = json_object ();
-  json_object_set_new (attr_obj, "value", json_string (tmp_value));
-  json_object_set_new (attr_obj, "name", json_string (attr->name));
-
-  if (GNUNET_RECLAIM_id_is_zero (&attr->credential))
-    json_object_set_new (attr_obj, "flag", json_string ("0"));
-  else
-    json_object_set_new (attr_obj, "flag", json_string ("1"));
-  type = GNUNET_RECLAIM_attribute_number_to_typename (attr->type);
-  json_object_set_new (attr_obj, "type", json_string (type));
-  id_str = GNUNET_STRINGS_data_to_string_alloc (&attr->id,
-                                                sizeof(attr->id));
-  json_object_set_new (attr_obj, "id", json_string (id_str));
-  GNUNET_free (id_str);
-  id_str = GNUNET_STRINGS_data_to_string_alloc (&attr->credential,
-                                                sizeof(attr->credential));
-  json_object_set_new (attr_obj, "credential", json_string (id_str));
-  GNUNET_free (id_str);
-  json_array_append (handle->resp_object, attr_obj);
-  json_decref (attr_obj);
-  GNUNET_free (tmp_value);
-  GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
-}
-
-
-/**
- * List attributes for identity request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-list_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                     const char *url,
-                     void *cls)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *priv_key;
-  struct RequestHandle *handle = cls;
-  struct EgoEntry *ego_entry;
-  char *identity;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting attributes for %s.\n",
-              handle->url);
-  if (strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) >= strlen (handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity = handle->url + strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) + 1;
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-  handle->resp_object = json_array ();
-
-
-  if (NULL == ego_entry)
-  {
-    // Done
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego %s not found.\n", identity);
-    GNUNET_SCHEDULER_add_now (&return_response, handle);
-    return;
-  }
-  priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  handle->attr_it = GNUNET_RECLAIM_get_attributes_start (idp,
-                                                         priv_key,
-                                                         &collect_error_cb,
-                                                         handle,
-                                                         &attr_collect,
-                                                         handle,
-                                                         &collect_finished_cb,
-                                                         handle);
-}
-
-
-/**
- * List attributes for identity request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-delete_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                       const char *url,
-                       void *cls)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *priv_key;
-  struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_Attribute attr;
-  struct EgoEntry *ego_entry;
-  char *identity_id_str;
-  char *identity;
-  char *id;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting attributes.\n");
-  if (strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) >= strlen (handle->url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  identity_id_str =
-    strdup (handle->url + strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) + 1);
-  identity = strtok (identity_id_str, "/");
-  id = strtok (NULL, "/");
-  if ((NULL == identity) || (NULL == id))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed request.\n");
-    GNUNET_free (identity_id_str);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-    if (0 == strcmp (identity, ego_entry->identifier))
-      break;
-  handle->resp_object = json_array ();
-  if (NULL == ego_entry)
-  {
-    // Done
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego %s not found.\n", identity);
-    GNUNET_free (identity_id_str);
-    GNUNET_SCHEDULER_add_now (&return_response, handle);
-    return;
-  }
-  priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  memset (&attr, 0, sizeof(struct GNUNET_RECLAIM_Attribute));
-  GNUNET_STRINGS_string_to_data (id, strlen (id), &attr.id, sizeof(attr.id));
-  attr.name = "";
-  handle->idp_op = GNUNET_RECLAIM_attribute_delete (idp,
-                                                    priv_key,
-                                                    &attr,
-                                                    &delete_finished_cb,
-                                                    handle);
-  GNUNET_free (identity_id_str);
-}
-
-
-static void
-revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                    const char *url,
-                    void *cls)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *identity_priv;
-  struct RequestHandle *handle = cls;
-  struct EgoEntry *ego_entry;
-  struct GNUNET_RECLAIM_Ticket *ticket = NULL;
-  struct GNUNET_CRYPTO_PublicKey tmp_pk;
-  char term_data[handle->rest_handle->data_size + 1];
-  json_t *data_json;
-  json_error_t err;
-  struct GNUNET_JSON_Specification tktspec[] =
-  { GNUNET_RECLAIM_JSON_spec_ticket (&ticket), GNUNET_JSON_spec_end () };
-
-  if (0 >= handle->rest_handle->data_size)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy (term_data,
-                 handle->rest_handle->data,
-                 handle->rest_handle->data_size);
-  data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
-  if ((NULL == data_json) ||
-      (GNUNET_OK != GNUNET_JSON_parse (data_json, tktspec, NULL, NULL)))
-  {
-    handle->emsg = GNUNET_strdup ("Not a ticket!\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    GNUNET_JSON_parse_free (tktspec);
-    if (NULL != data_json)
-      json_decref (data_json);
-    return;
-  }
-  json_decref (data_json);
-  if (NULL == ticket)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse ticket from %s\n",
-                term_data);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-  {
-    GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk);
-    if (0 == memcmp (&ticket->identity,
-                     &tmp_pk,
-                     sizeof(struct GNUNET_CRYPTO_PublicKey)))
-      break;
-  }
-  if (NULL == ego_entry)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Identity unknown\n");
-    GNUNET_JSON_parse_free (tktspec);
-    return;
-  }
-  identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-
-  handle->idp_op = GNUNET_RECLAIM_ticket_revoke (idp,
-                                                 identity_priv,
-                                                 ticket,
-                                                 &finished_cont,
-                                                 handle);
-  GNUNET_JSON_parse_free (tktspec);
-}
-
-
-static void
-consume_cont (void *cls,
-              const struct GNUNET_CRYPTO_PublicKey *identity,
-              const struct GNUNET_RECLAIM_Attribute *attr,
-              const struct GNUNET_RECLAIM_Presentation *presentation)
-{
-  struct RequestHandle *handle = cls;
-  char *val_str;
-  json_t *value;
-
-  if (NULL == identity)
-  {
-    GNUNET_SCHEDULER_add_now (&return_response, handle);
-    return;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding attribute: %s\n", attr->name);
-  val_str = GNUNET_RECLAIM_attribute_value_to_string (attr->type,
-                                                      attr->data,
-                                                      attr->data_size);
-  if (NULL == val_str)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to parse value for: %s\n",
-                attr->name);
-    return;
-  }
-  value = json_string (val_str);
-  json_object_set_new (handle->resp_object, attr->name, value);
-  json_decref (value);
-  GNUNET_free (val_str);
-}
-
-
-static void
-consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
-                     const char *url,
-                     void *cls)
-{
-  const struct GNUNET_CRYPTO_PrivateKey *identity_priv;
-  struct RequestHandle *handle = cls;
-  struct EgoEntry *ego_entry;
-  struct GNUNET_RECLAIM_Ticket *ticket;
-  struct GNUNET_CRYPTO_PublicKey tmp_pk;
-  char term_data[handle->rest_handle->data_size + 1];
-  json_t *data_json;
-  json_error_t err;
-  struct GNUNET_JSON_Specification tktspec[] =
-  { GNUNET_RECLAIM_JSON_spec_ticket (&ticket), GNUNET_JSON_spec_end () };
-
-  if (0 >= handle->rest_handle->data_size)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-
-  term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy (term_data,
-                 handle->rest_handle->data,
-                 handle->rest_handle->data_size);
-  data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
-  if (NULL == data_json)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to parse JSON Object from %s\n",
-                term_data);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  if (GNUNET_OK != GNUNET_JSON_parse (data_json, tktspec, NULL, NULL))
-  {
-    handle->emsg = GNUNET_strdup ("Not a ticket!\n");
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    GNUNET_JSON_parse_free (tktspec);
-    json_decref (data_json);
-    return;
-  }
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-  {
-    GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk);
-    if (0 == memcmp (&ticket->audience,
-                     &tmp_pk,
-                     sizeof(struct GNUNET_CRYPTO_PublicKey)))
-      break;
-  }
-  if (NULL == ego_entry)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Identity unknown\n");
-    GNUNET_JSON_parse_free (tktspec);
-    return;
-  }
-  identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  handle->resp_object = json_object ();
-  handle->idp_op = GNUNET_RECLAIM_ticket_consume (idp,
-                                                  identity_priv,
-                                                  ticket,
-                                                  &consume_cont,
-                                                  handle);
-  GNUNET_JSON_parse_free (tktspec);
-}
-
-
-/**
- * Respond to OPTIONS request
- *
- * @param con_handle the connection handle
- * @param url the url
- * @param cls the RequestHandle
- */
-static void
-options_cont (struct GNUNET_REST_RequestHandle *con_handle,
-              const char *url,
-              void *cls)
-{
-  struct MHD_Response *resp;
-  struct RequestHandle *handle = cls;
-
-  // For now, independent of path return all options
-  resp = GNUNET_REST_create_response (NULL);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp, "Access-Control-Allow-Methods", allow_methods));
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  cleanup_handle (handle);
-  return;
-}
-
-
-/**
- * If listing is enabled, prints information about the egos.
- *
- * This function is initially called for all egos and then again
- * whenever a ego's identifier changes or if it is deleted.  At the
- * end of the initial pass over all egos, the function is once called
- * with 'NULL' for 'ego'. That does NOT mean that the callback won't
- * be invoked in the future or that there was an error.
- *
- * When used with 'GNUNET_IDENTITY_create' or 'GNUNET_IDENTITY_get', this
- * function is only called ONCE, and 'NULL' being passed in 'ego' does
- * indicate an error (for example because name is taken or no default value is
- * known).  If 'ego' is non-NULL and if '*ctx' is set in those callbacks, the
- * value WILL be passed to a subsequent call to the identity callback of
- * 'GNUNET_IDENTITY_connect' (if that one was not NULL).
- *
- * When an identity is renamed, this function is called with the
- * (known) ego but the NEW identifier.
- *
- * When an identity is deleted, this function is called with the
- * (known) ego and "NULL" for the 'identifier'.  In this case,
- * the 'ego' is henceforth invalid (and the 'ctx' should also be
- * cleaned up).
- *
- * @param cls closure
- * @param ego ego handle
- * @param ctx context for application to store data for this ego
- *                 (during the lifetime of this process, initially NULL)
- * @param identifier identifier assigned by the user for this ego,
- *                   NULL if the user just deleted the ego and it
- *                   must thus no longer be used
- */
-static void
-list_ego (void *cls,
-          struct GNUNET_IDENTITY_Ego *ego,
-          void **ctx,
-          const char *identifier)
-{
-  struct EgoEntry *ego_entry;
-  struct GNUNET_CRYPTO_PublicKey pk;
-
-  if (NULL == ego)
-  {
-    state = ID_REST_STATE_POST_INIT;
-    return;
-  }
-  if (ID_REST_STATE_INIT == state)
-  {
-    ego_entry = GNUNET_new (struct EgoEntry);
-    GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-    ego_entry->keystring = GNUNET_CRYPTO_public_key_to_string (&pk);
-    ego_entry->ego = ego;
-    ego_entry->identifier = GNUNET_strdup (identifier);
-    GNUNET_CONTAINER_DLL_insert_tail (ego_head,
-                                      ego_tail,
-                                      ego_entry);
-  }
-  /* Ego renamed or added */
-  if (identifier != NULL)
-  {
-    for (ego_entry = ego_head; NULL != ego_entry;
-         ego_entry = ego_entry->next)
-    {
-      if (ego_entry->ego == ego)
-      {
-        /* Rename */
-        GNUNET_free (ego_entry->identifier);
-        ego_entry->identifier = GNUNET_strdup (identifier);
-        break;
-      }
-    }
-    if (NULL == ego_entry)
-    {
-      /* Add */
-      ego_entry = GNUNET_new (struct EgoEntry);
-      GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-      ego_entry->keystring = GNUNET_CRYPTO_public_key_to_string (&pk);
-      ego_entry->ego = ego;
-      ego_entry->identifier = GNUNET_strdup (identifier);
-      GNUNET_CONTAINER_DLL_insert_tail (ego_head,
-                                        ego_tail,
-                                        ego_entry);
-    }
-  }
-  else
-  {
-    /* Delete */
-    for (ego_entry = ego_head; NULL != ego_entry;
-         ego_entry = ego_entry->next)
-    {
-      if (ego_entry->ego == ego)
-        break;
-    }
-    if (NULL == ego_entry)
-      return; /* Not found */
-
-    GNUNET_CONTAINER_DLL_remove (ego_head,
-                                 ego_tail,
-                                 ego_entry);
-    GNUNET_free (ego_entry->identifier);
-    GNUNET_free (ego_entry->keystring);
-    GNUNET_free (ego_entry);
-    return;
-  }
-
-}
-
-
-static enum GNUNET_GenericReturnValue
-rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                               GNUNET_REST_ResultProcessor proc,
-                               void *proc_cls)
-{
-  struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
-  struct GNUNET_REST_RequestHandlerError err;
-  static const struct GNUNET_REST_RequestHandler handlers[] =
-  { { MHD_HTTP_METHOD_GET,
-      GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES, &list_attribute_cont },
-    { MHD_HTTP_METHOD_POST,
-      GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES, &add_attribute_cont },
-    { MHD_HTTP_METHOD_DELETE,
-      GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES, &delete_attribute_cont },
-    { MHD_HTTP_METHOD_GET,
-      GNUNET_REST_API_NS_RECLAIM_CREDENTIAL, &list_credential_cont },
-    { MHD_HTTP_METHOD_POST,
-      GNUNET_REST_API_NS_RECLAIM_CREDENTIAL, &add_credential_cont },
-    { MHD_HTTP_METHOD_DELETE,
-      GNUNET_REST_API_NS_RECLAIM_CREDENTIAL, &delete_credential_cont },
-    { MHD_HTTP_METHOD_GET,
-      GNUNET_REST_API_NS_IDENTITY_TICKETS, &list_tickets_cont },
-    { MHD_HTTP_METHOD_POST,
-      GNUNET_REST_API_NS_IDENTITY_REVOKE, &revoke_ticket_cont },
-    { MHD_HTTP_METHOD_POST,
-      GNUNET_REST_API_NS_IDENTITY_CONSUME, &consume_ticket_cont },
-    { MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_RECLAIM, &options_cont },
-    GNUNET_REST_HANDLER_END};
-
-  handle->response_code = 0;
-  handle->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-  handle->proc_cls = proc_cls;
-  handle->proc = proc;
-  handle->rest_handle = rest_handle;
-
-  handle->url = GNUNET_strdup (rest_handle->url);
-  if (handle->url[strlen (handle->url) - 1] == '/')
-    handle->url[strlen (handle->url) - 1] = '\0';
-  handle->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (handle->timeout, &do_timeout, handle);
-  GNUNET_CONTAINER_DLL_insert (requests_head,
-                               requests_tail,
-                               handle);
-  if (GNUNET_NO ==
-      GNUNET_REST_handle_request (handle->rest_handle, handlers, &err, handle))
-  {
-    cleanup_handle (handle);
-    return GNUNET_NO;
-  }
-
-  return GNUNET_YES;
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls Config info
- * @return NULL on error, otherwise the plugin context
- */
-void *
-libgnunet_plugin_rest_reclaim_init (void *cls)
-{
-  static struct Plugin plugin;
-  struct GNUNET_REST_Plugin *api;
-
-  cfg = cls;
-  if (NULL != plugin.cfg)
-    return NULL; /* can only initialize once! */
-  memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
-  api = GNUNET_new (struct GNUNET_REST_Plugin);
-  api->cls = &plugin;
-  api->name = GNUNET_REST_API_NS_RECLAIM;
-  api->process_request = &rest_identity_process_request;
-  GNUNET_asprintf (&allow_methods,
-                   "%s, %s, %s, %s, %s",
-                   MHD_HTTP_METHOD_GET,
-                   MHD_HTTP_METHOD_POST,
-                   MHD_HTTP_METHOD_PUT,
-                   MHD_HTTP_METHOD_DELETE,
-                   MHD_HTTP_METHOD_OPTIONS);
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &list_ego, NULL);
-  state = ID_REST_STATE_INIT;
-  idp = GNUNET_RECLAIM_connect (cfg);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              _ ("Identity Provider REST API initialized\n"));
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the plugin context (as returned by "init")
- * @return always NULL
- */
-void *
-libgnunet_plugin_rest_reclaim_done (void *cls)
-{
-  struct GNUNET_REST_Plugin *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct RequestHandle *request;
-  struct EgoEntry *ego_entry;
-  struct EgoEntry *ego_tmp;
-
-  plugin->cfg = NULL;
-  while (NULL != (request = requests_head))
-    do_error (request);
-  if (NULL != idp)
-    GNUNET_RECLAIM_disconnect (idp);
-  if (NULL != identity_handle)
-    GNUNET_IDENTITY_disconnect (identity_handle);
-  for (ego_entry = ego_head; NULL != ego_entry;)
-  {
-    ego_tmp = ego_entry;
-    ego_entry = ego_entry->next;
-    GNUNET_free (ego_tmp->identifier);
-    GNUNET_free (ego_tmp->keystring);
-    GNUNET_free (ego_tmp);
-  }
-
-  GNUNET_free (allow_methods);
-  GNUNET_free (api);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Identity Provider REST plugin is finished\n");
-  return NULL;
-}
-
-
-/* end of plugin_rest_reclaim.c */
diff --git a/src/reclaim/reclaim.conf b/src/reclaim/reclaim.conf
deleted file mode 100644
index 07facc232..000000000
--- a/src/reclaim/reclaim.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[reclaim]
-START_ON_DEMAND = YES
-RUN_PER_USER = YES
-#PORT = 2108
-HOSTNAME = localhost
-BINARY = gnunet-service-reclaim
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-reclaim.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-TICKET_REFRESH_INTERVAL = 6h
-
-[reclaim-rest-plugin]
-#ADDRESS = https://identity.gnu:8000#/login
-ADDRESS = https://ui.reclaim/#/login
-OIDC_JSON_WEB_ALGORITHM = RS256
-OIDC_CLIENT_HMAC_SECRET = secret
-OIDC_DIR = $GNUNET_DATA_HOME/oidc
-OIDC_USERINFO_CONSUME_TIMEOUT = 5s
-JWT_SECRET = secret
-EXPIRATION_TIME = 1d
diff --git a/src/reclaim/reclaim.h b/src/reclaim/reclaim.h
deleted file mode 100644
index 9d5118269..000000000
--- a/src/reclaim/reclaim.h
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author Martin Schanzenbach
- * @file reclaim/reclaim.h
- *
- * @brief Common type definitions for the identity provider
- *        service and API.
- */
-#ifndef RECLAIM_H
-#define RECLAIM_H
-
-#include "gnunet_common.h"
-#include "gnunet_identity_service.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-/**
- * Use to store an identity attribute
- */
-struct AttributeStoreMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_IDENTITY_SET_DEFAULT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * The expiration interval of the attribute
-   */
-  uint64_t exp GNUNET_PACKED;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * The length of the attribute
-   */
-  uint16_t attr_len GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /*
-   * followed by the zone private key
-   * followed by the serialized attribute */
-};
-
-
-/**
- * Use to delete an identity attribute
- */
-struct AttributeDeleteMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_IDENTITY_SET_DEFAULT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * The length of the attribute
-   */
-  uint16_t attr_len GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /* followed by the serialized attribute */
-};
-
-
-/**
- * Attribute store/delete response message
- */
-struct SuccessResultMessage
-{
-  /**
-   * Message header
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * #GNUNET_SYSERR on failure, #GNUNET_OK on success
-   */
-  int32_t op_result GNUNET_PACKED;
-};
-
-/**
- * Attribute is returned from the idp.
- */
-struct AttributeResultMessage
-{
-  /**
-   * Message header
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * Length of serialized attribute data
-   */
-  uint16_t attr_len GNUNET_PACKED;
-
-  /**
-   * Length of serialized credential data
-   */
-  uint16_t credential_len GNUNET_PACKED;
-
-  /**
-   * The length of the public key
-   */
-  uint16_t pkey_len GNUNET_PACKED;
-
-  /**
-   * followed by the public key key.
-   * followed by:
-   * serialized attribute data
-   */
-};
-
-/**
- * Credential is returned from the idp.
- */
-struct CredentialResultMessage
-{
-  /**
-   * Message header
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Length of serialized attribute data
-   */
-  uint16_t credential_len GNUNET_PACKED;
-
-  /**
-   * The length of the public key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * followed by the private key.
-   * followed by:
-   * serialized credential data
-   */
-};
-
-
-/**
- * Start a attribute iteration for the given identity
- */
-struct AttributeIterationStartMessage
-{
-  /**
-   * Message
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * followed by the private key.
-   */
-};
-
-
-/**
- * Ask for next result of attribute iteration for the given operation
- */
-struct AttributeIterationNextMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-};
-
-
-/**
- * Start a credential iteration for the given identity
- */
-struct CredentialIterationStartMessage
-{
-  /**
-   * Message
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * followed by the private key.
-   */
-};
-
-
-/**
- * Ask for next result of credential iteration for the given operation
- */
-struct CredentialIterationNextMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-};
-
-
-/**
- * Stop credential iteration for the given operation
- */
-struct CredentialIterationStopMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-};
-
-
-/**
- * Stop attribute iteration for the given operation
- */
-struct AttributeIterationStopMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-};
-
-/**
- * Start a ticket iteration for the given identity
- */
-struct TicketIterationStartMessage
-{
-  /**
-   * Message
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * followed by the private key.
-   */
-};
-
-
-/**
- * Ask for next result of ticket iteration for the given operation
- */
-struct TicketIterationNextMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-};
-
-
-/**
- * Stop ticket iteration for the given operation
- */
-struct TicketIterationStopMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-};
-
-
-/**
- * Ticket issue message
- */
-struct IssueTicketMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * length of serialized attribute list
-   */
-  uint16_t attr_len GNUNET_PACKED;
-
-  /**
-   * The length of the identity private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * The length of the relying party public key
-   */
-  uint16_t pkey_len GNUNET_PACKED;
-
-  /**
-   * Followed by the private key.
-   * Followed by the public key.
-   * Followed by a serialized attribute list
-   */
-};
-
-/**
- * Ticket revoke message
- */
-struct RevokeTicketMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * The length of the ticket
-   */
-  uint16_t tkt_len GNUNET_PACKED;
-
-  /**
-   * Followed by the serialized ticket.
-   * Followed by the private key.
-   * Followed by a serialized attribute list
-   */
-};
-
-/**
- * Ticket revoke message
- */
-struct RevokeTicketResultMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Revocation result
-   */
-  uint32_t success GNUNET_PACKED;
-};
-
-
-/**
- * Ticket result message
- */
-struct TicketResultMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Ticket length
-   */
-  uint16_t tkt_len GNUNET_PACKED;
-
-  /**
-   * Length of new presentations created
-   */
-  uint16_t presentations_len GNUNET_PACKED;
-
-  /*
-   * Followed by the serialized ticket
-   * Followed by the serialized GNUNET_RECLAIM_PresentationList
-   */
-};
-
-/**
- * Ticket consume message
- */
-struct ConsumeTicketMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * The length of the ticket
-   */
-  uint16_t tkt_len GNUNET_PACKED;
-
-  /**
-   * Followed by the private key.
-   * Followed by the serialized ticket.
-   */
-};
-
-/**
- * Attribute list is returned from the idp.
- */
-struct ConsumeTicketResultMessage
-{
-  /**
-   * Message header
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique identifier for this request (for key collisions).
-   */
-  uint32_t id GNUNET_PACKED;
-
-  /**
-   * Result
-   */
-  uint32_t result GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * Length of serialized attribute data
-   */
-  uint16_t attrs_len GNUNET_PACKED;
-
-  /**
-   * Length of presentation data
-   */
-  uint16_t presentations_len;
-
-  /**
-   * The length of the private key
-   */
-  uint16_t key_len GNUNET_PACKED;
-
-  /**
-   * Followed by the private key.
-   * followed by:
-   * serialized attributes data
-   */
-};
-
-
-GNUNET_NETWORK_STRUCT_END
-
-#endif
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
deleted file mode 100644
index e9a34dd95..000000000
--- a/src/reclaim/reclaim_api.c
+++ /dev/null
@@ -1,1813 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2016 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/reclaim_api.c
- * @brief api to interact with the reclaim service
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_reclaim_lib.h"
-#include "gnunet_reclaim_service.h"
-#include "reclaim.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "reclaim-api", __VA_ARGS__)
-
-
-/**
- * Handle for an operation with the service.
- */
-struct GNUNET_RECLAIM_Operation
-{
-  /**
-   * Main handle.
-   */
-  struct GNUNET_RECLAIM_Handle *h;
-
-  /**
-   * We keep operations in a DLL.
-   */
-  struct GNUNET_RECLAIM_Operation *next;
-
-  /**
-   * We keep operations in a DLL.
-   */
-  struct GNUNET_RECLAIM_Operation *prev;
-
-  /**
-   * Message to send to the service.
-   * Allocated at the end of this struct.
-   */
-  const struct GNUNET_MessageHeader *msg;
-
-  /**
-   * Continuation to invoke after attribute store call
-   */
-  GNUNET_RECLAIM_ContinuationWithStatus as_cb;
-
-  /**
-   * Attribute result callback
-   */
-  GNUNET_RECLAIM_AttributeResult ar_cb;
-
-  /**
-   * Attribute result callback
-   */
-  GNUNET_RECLAIM_AttributeTicketResult atr_cb;
-
-  /**
-   * Credential result callback
-   */
-  GNUNET_RECLAIM_CredentialResult at_cb;
-
-  /**
-   * Revocation result callback
-   */
-  GNUNET_RECLAIM_ContinuationWithStatus rvk_cb;
-
-  /**
-   * Ticket result callback
-   */
-  GNUNET_RECLAIM_TicketCallback tr_cb;
-
-  /**
-   * Ticket issue result callback
-   */
-  GNUNET_RECLAIM_IssueTicketCallback ti_cb;
-
-  /**
-   * Envelope with the message for this queue entry.
-   */
-  struct GNUNET_MQ_Envelope *env;
-
-  /**
-   * request id
-   */
-  uint32_t r_id;
-
-  /**
-   * Closure for @e cont or @e cb.
-   */
-  void *cls;
-};
-
-
-/**
- * Handle for a ticket iterator operation
- */
-struct GNUNET_RECLAIM_TicketIterator
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_RECLAIM_TicketIterator *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_RECLAIM_TicketIterator *prev;
-
-  /**
-   * Main handle to access the idp.
-   */
-  struct GNUNET_RECLAIM_Handle *h;
-
-  /**
-   * Function to call on completion.
-   */
-  GNUNET_SCHEDULER_TaskCallback finish_cb;
-
-  /**
-   * Closure for @e finish_cb.
-   */
-  void *finish_cb_cls;
-
-  /**
-   * The continuation to call with the results
-   */
-  GNUNET_RECLAIM_TicketCallback tr_cb;
-
-  /**
-   * Closure for @e tr_cb.
-   */
-  void *cls;
-
-  /**
-   * Function to call on errors.
-   */
-  GNUNET_SCHEDULER_TaskCallback error_cb;
-
-  /**
-   * Closure for @e error_cb.
-   */
-  void *error_cb_cls;
-
-  /**
-   * Envelope of the message to send to the service, if not yet
-   * sent.
-   */
-  struct GNUNET_MQ_Envelope *env;
-
-  /**
-   * The operation id this zone iteration operation has
-   */
-  uint32_t r_id;
-};
-
-
-/**
- * Handle for a attribute iterator operation
- */
-struct GNUNET_RECLAIM_AttributeIterator
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_RECLAIM_AttributeIterator *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_RECLAIM_AttributeIterator *prev;
-
-  /**
-   * Main handle to access the service.
-   */
-  struct GNUNET_RECLAIM_Handle *h;
-
-  /**
-   * Function to call on completion.
-   */
-  GNUNET_SCHEDULER_TaskCallback finish_cb;
-
-  /**
-   * Closure for @e finish_cb.
-   */
-  void *finish_cb_cls;
-
-  /**
-   * The continuation to call with the results
-   */
-  GNUNET_RECLAIM_AttributeResult proc;
-
-  /**
-   * Closure for @e proc.
-   */
-  void *proc_cls;
-
-  /**
-   * Function to call on errors.
-   */
-  GNUNET_SCHEDULER_TaskCallback error_cb;
-
-  /**
-   * Closure for @e error_cb.
-   */
-  void *error_cb_cls;
-
-  /**
-   * Envelope of the message to send to the service, if not yet
-   * sent.
-   */
-  struct GNUNET_MQ_Envelope *env;
-
-  /**
-   * Private key of the zone.
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * The operation id this zone iteration operation has
-   */
-  uint32_t r_id;
-};
-
-/**
- * Handle for a credential iterator operation
- */
-struct GNUNET_RECLAIM_CredentialIterator
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_RECLAIM_CredentialIterator *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_RECLAIM_CredentialIterator *prev;
-
-  /**
-   * Main handle to access the service.
-   */
-  struct GNUNET_RECLAIM_Handle *h;
-
-  /**
-   * Function to call on completion.
-   */
-  GNUNET_SCHEDULER_TaskCallback finish_cb;
-
-  /**
-   * Closure for @e finish_cb.
-   */
-  void *finish_cb_cls;
-
-  /**
-   * The continuation to call with the results
-   */
-  GNUNET_RECLAIM_CredentialResult proc;
-
-  /**
-   * Closure for @e proc.
-   */
-  void *proc_cls;
-
-  /**
-   * Function to call on errors.
-   */
-  GNUNET_SCHEDULER_TaskCallback error_cb;
-
-  /**
-   * Closure for @e error_cb.
-   */
-  void *error_cb_cls;
-
-  /**
-   * Envelope of the message to send to the service, if not yet
-   * sent.
-   */
-  struct GNUNET_MQ_Envelope *env;
-
-  /**
-   * Private key of the zone.
-   */
-  struct GNUNET_CRYPTO_PrivateKey identity;
-
-  /**
-   * The operation id this zone iteration operation has
-   */
-  uint32_t r_id;
-};
-
-
-/**
- * Handle to the service.
- */
-struct GNUNET_RECLAIM_Handle
-{
-  /**
-   * Configuration to use.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Socket (if available).
-   */
-  struct GNUNET_CLIENT_Connection *client;
-
-  /**
-   * Closure for 'cb'.
-   */
-  void *cb_cls;
-
-  /**
-   * Head of active operations.
-   */
-  struct GNUNET_RECLAIM_Operation *op_head;
-
-  /**
-   * Tail of active operations.
-   */
-  struct GNUNET_RECLAIM_Operation *op_tail;
-
-  /**
-   * Head of active iterations
-   */
-  struct GNUNET_RECLAIM_AttributeIterator *it_head;
-
-  /**
-   * Tail of active iterations
-   */
-  struct GNUNET_RECLAIM_AttributeIterator *it_tail;
-
-  /**
-   * Head of active iterations
-   */
-  struct GNUNET_RECLAIM_CredentialIterator *ait_head;
-
-  /**
-   * Tail of active iterations
-   */
-  struct GNUNET_RECLAIM_CredentialIterator *ait_tail;
-
-  /**
-   * Head of active iterations
-   */
-  struct GNUNET_RECLAIM_TicketIterator *ticket_it_head;
-
-  /**
-   * Tail of active iterations
-   */
-  struct GNUNET_RECLAIM_TicketIterator *ticket_it_tail;
-
-  /**
-   * Currently pending transmission request, or NULL for none.
-   */
-  struct GNUNET_CLIENT_TransmitHandle *th;
-
-  /**
-   * Task doing exponential back-off trying to reconnect.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  /**
-   * Time for next connect retry.
-   */
-  struct GNUNET_TIME_Relative reconnect_backoff;
-
-  /**
-   * Connection to service (if available).
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Request Id generator.  Incremented by one for each request.
-   */
-  uint32_t r_id_gen;
-
-  /**
-   * Are we polling for incoming messages right now?
-   */
-  int in_receive;
-};
-
-
-/**
- * Try again to connect to the service.
- *
- * @param h handle to the reclaim service.
- */
-static void
-reconnect (struct GNUNET_RECLAIM_Handle *h);
-
-
-/**
- * Reconnect
- *
- * @param cls the handle
- */
-static void
-reconnect_task (void *cls)
-{
-  struct GNUNET_RECLAIM_Handle *handle = cls;
-
-  handle->reconnect_task = NULL;
-  reconnect (handle);
-}
-
-
-/**
- * Disconnect from service and then reconnect.
- *
- * @param handle our service
- */
-static void
-force_reconnect (struct GNUNET_RECLAIM_Handle *handle)
-{
-  GNUNET_MQ_destroy (handle->mq);
-  handle->mq = NULL;
-  handle->reconnect_backoff =
-    GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
-  handle->reconnect_task =
-    GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
-                                  &reconnect_task,
-                                  handle);
-}
-
-
-/**
- * Free @a it.
- *
- * @param it entry to free
- */
-static void
-free_it (struct GNUNET_RECLAIM_AttributeIterator *it)
-{
-  struct GNUNET_RECLAIM_Handle *h = it->h;
-
-  GNUNET_CONTAINER_DLL_remove (h->it_head, h->it_tail, it);
-  if (NULL != it->env)
-    GNUNET_MQ_discard (it->env);
-  GNUNET_free (it);
-}
-
-
-/**
- * Free @a it.
- *
- * @param ait entry to free
- */
-static void
-free_ait (struct GNUNET_RECLAIM_CredentialIterator *ait)
-{
-  struct GNUNET_RECLAIM_Handle *h = ait->h;
-
-  GNUNET_CONTAINER_DLL_remove (h->ait_head, h->ait_tail, ait);
-  if (NULL != ait->env)
-    GNUNET_MQ_discard (ait->env);
-  GNUNET_free (ait);
-}
-
-
-/**
- * Free @a op
- *
- * @param op the operation to free
- */
-static void
-free_op (struct GNUNET_RECLAIM_Operation *op)
-{
-  if (NULL == op)
-    return;
-  if (NULL != op->env)
-    GNUNET_MQ_discard (op->env);
-  GNUNET_free (op);
-}
-
-
-/**
- * Generic error handler, called with the appropriate error code and
- * the same closure specified at the creation of the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_GNS_Handle *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_RECLAIM_Handle *handle = cls;
-
-  force_reconnect (handle);
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_SUCCESS_RESPONSE
- *
- * @param cls
- * @param msg the message we received
- */
-static void
-handle_success_response (void *cls, const struct SuccessResultMessage *msg)
-{
-  struct GNUNET_RECLAIM_Handle *h = cls;
-  struct GNUNET_RECLAIM_Operation *op;
-  uint32_t r_id = ntohl (msg->id);
-  int res;
-  const char *emsg;
-
-  for (op = h->op_head; NULL != op; op = op->next)
-    if (op->r_id == r_id)
-      break;
-  if (NULL == op)
-    return;
-
-  res = ntohl (msg->op_result);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received SUCCESS_RESPONSE with result %d\n",
-       res);
-
-  /* TODO: add actual error message to response... */
-  if (GNUNET_SYSERR == res)
-    emsg = _ ("failed to store record\n");
-  else
-    emsg = NULL;
-  if (NULL != op->as_cb)
-    op->as_cb (op->cls, res, emsg);
-  GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
-  free_op (op);
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT
- *
- * @param cls
- * @param msg the message we received
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-check_consume_ticket_result (void *cls,
-                             const struct ConsumeTicketResultMessage *msg)
-{
-  size_t msg_len;
-  size_t attrs_len;
-  size_t pl_len;
-  size_t key_len;
-
-  msg_len = ntohs (msg->header.size);
-  attrs_len = ntohs (msg->attrs_len);
-  key_len = ntohs (msg->key_len);
-  pl_len = ntohs (msg->presentations_len);
-  if (msg_len != sizeof(*msg) + attrs_len + pl_len + key_len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT
- *
- * @param cls
- * @param msg the message we received
- */
-static void
-handle_consume_ticket_result (void *cls,
-                              const struct ConsumeTicketResultMessage *msg)
-{
-  struct GNUNET_CRYPTO_PublicKey identity;
-  struct GNUNET_RECLAIM_Handle *h = cls;
-  struct GNUNET_RECLAIM_Operation *op;
-  size_t attrs_len;
-  size_t pl_len;
-  size_t key_len;
-  size_t read;
-  uint32_t r_id = ntohl (msg->id);
-  char *read_ptr;
-
-  attrs_len = ntohs (msg->attrs_len);
-  key_len = ntohs (msg->key_len);
-  pl_len = ntohs (msg->presentations_len);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Processing ticket result.\n");
-
-
-  for (op = h->op_head; NULL != op; op = op->next)
-    if (op->r_id == r_id)
-      break;
-  if (NULL == op)
-    return;
-
-  {
-    struct GNUNET_RECLAIM_AttributeList *attrs;
-    struct GNUNET_RECLAIM_AttributeListEntry *le;
-    struct GNUNET_RECLAIM_PresentationList *pl;
-    struct GNUNET_RECLAIM_PresentationListEntry *ple;
-    read_ptr = (char *) &msg[1];
-    GNUNET_assert (GNUNET_SYSERR !=
-                   GNUNET_CRYPTO_read_public_key_from_buffer (read_ptr,
-                                                                key_len,
-                                                                &identity,
-                                                                &read));
-    read_ptr += read;
-    attrs =
-      GNUNET_RECLAIM_attribute_list_deserialize (read_ptr, attrs_len);
-    read_ptr += attrs_len;
-    pl = GNUNET_RECLAIM_presentation_list_deserialize (read_ptr, pl_len);
-    if (NULL != op->atr_cb)
-    {
-      if (NULL == attrs)
-      {
-        op->atr_cb (op->cls, &identity, NULL, NULL);
-      }
-      else
-      {
-        for (le = attrs->list_head; NULL != le; le = le->next)
-        {
-          if (GNUNET_NO ==
-              GNUNET_RECLAIM_id_is_zero (&le->attribute->credential))
-          {
-            for (ple = pl->list_head; NULL != ple; ple = ple->next)
-            {
-              if (GNUNET_YES ==
-                  GNUNET_RECLAIM_id_is_equal (&le->attribute->credential,
-                                              &ple->presentation->credential_id))
-              {
-                op->atr_cb (op->cls, &identity,
-                            le->attribute, ple->presentation);
-                break;
-              }
-
-            }
-          }
-          else     // No credentials
-          {
-            op->atr_cb (op->cls, &identity,
-                        le->attribute, NULL);
-          }
-        }
-      }
-      op->atr_cb (op->cls, NULL, NULL, NULL);
-    }
-    if (NULL != attrs)
-      GNUNET_RECLAIM_attribute_list_destroy (attrs);
-    if (NULL != pl)
-      GNUNET_RECLAIM_presentation_list_destroy (pl);
-    GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
-    free_op (op);
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT
- *
- * @param cls
- * @param msg the message we received
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-check_attribute_result (void *cls, const struct AttributeResultMessage *msg)
-{
-  size_t msg_len;
-  size_t attr_len;
-  size_t key_len;
-
-  msg_len = ntohs (msg->header.size);
-  attr_len = ntohs (msg->attr_len);
-  key_len = ntohs (msg->pkey_len);
-  if (msg_len != sizeof(*msg) + attr_len + key_len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT
- *
- * @param cls
- * @param msg the message we received
- */
-static void
-handle_attribute_result (void *cls, const struct AttributeResultMessage *msg)
-{
-  static struct GNUNET_CRYPTO_PublicKey identity;
-  struct GNUNET_RECLAIM_Handle *h = cls;
-  struct GNUNET_RECLAIM_AttributeIterator *it;
-  struct GNUNET_RECLAIM_Operation *op;
-  size_t attr_len;
-  size_t key_len;
-  size_t read;
-  uint32_t r_id = ntohl (msg->id);
-  char *buf;
-
-  attr_len = ntohs (msg->attr_len);
-  key_len = ntohs (msg->pkey_len);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing attribute result.\n");
-
-  for (it = h->it_head; NULL != it; it = it->next)
-    if (it->r_id == r_id)
-      break;
-  for (op = h->op_head; NULL != op; op = op->next)
-    if (op->r_id == r_id)
-      break;
-  if ((NULL == it) && (NULL == op))
-    return;
-
-  buf = (char *) &msg[1];
-  if (0 == key_len)
-  {
-    if ((NULL == it) && (NULL == op))
-    {
-      GNUNET_break (0);
-      force_reconnect (h);
-      return;
-    }
-    if (NULL != it)
-    {
-      if (NULL != it->finish_cb)
-        it->finish_cb (it->finish_cb_cls);
-      free_it (it);
-    }
-    if (NULL != op)
-    {
-      if (NULL != op->ar_cb)
-        op->ar_cb (op->cls, NULL, NULL);
-      GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
-      free_op (op);
-    }
-    return;
-  }
-
-  {
-    struct GNUNET_RECLAIM_Attribute *attr;
-    GNUNET_assert (GNUNET_SYSERR !=
-                   GNUNET_CRYPTO_read_public_key_from_buffer (buf,
-                                                                key_len,
-                                                                &identity,
-                                                                &read));
-    buf += read;
-    GNUNET_RECLAIM_attribute_deserialize (buf, attr_len, &attr);
-    if (NULL != it)
-    {
-      if (NULL != it->proc)
-        it->proc (it->proc_cls, &identity, attr);
-    }
-    else if (NULL != op)
-    {
-      if (NULL != op->ar_cb)
-        op->ar_cb (op->cls, &identity, attr);
-    }
-    GNUNET_free (attr);
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
-   * Handle an incoming message of type
-   * #GNUNET_MESSAGE_TYPE_RECLAIM_credential_RESULT
-   *
-   * @param cls
-   * @param msg the message we received
-   * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
-   */
-static int
-check_credential_result (void *cls, const struct CredentialResultMessage *msg)
-{
-  size_t msg_len;
-  size_t cred_len;
-  size_t key_len;
-
-  msg_len = ntohs (msg->header.size);
-  cred_len = ntohs (msg->credential_len);
-  key_len = ntohs (msg->key_len);
-  if (msg_len != sizeof(*msg) + cred_len + key_len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_credential_RESULT
- *
- * @param cls
- * @param msg the message we received
- */
-static void
-handle_credential_result (void *cls, const struct
-                          CredentialResultMessage *msg)
-{
-  struct GNUNET_CRYPTO_PublicKey identity;
-  struct GNUNET_RECLAIM_Handle *h = cls;
-  struct GNUNET_RECLAIM_CredentialIterator *it;
-  struct GNUNET_RECLAIM_Operation *op;
-  size_t att_len;
-  size_t key_len;
-  size_t read;
-  uint32_t r_id = ntohl (msg->id);
-  char *buf;
-
-  key_len = ntohs (msg->key_len);
-  att_len = ntohs (msg->credential_len);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing credential result.\n");
-
-
-  for (it = h->ait_head; NULL != it; it = it->next)
-    if (it->r_id == r_id)
-      break;
-  for (op = h->op_head; NULL != op; op = op->next)
-    if (op->r_id == r_id)
-      break;
-  if ((NULL == it) && (NULL == op))
-    return;
-
-  buf = (char *) &msg[1];
-  if (0 < key_len)
-  {
-    GNUNET_assert (GNUNET_SYSERR !=
-                   GNUNET_CRYPTO_read_public_key_from_buffer (buf,
-                                                                key_len,
-                                                                &identity,
-                                                                &read));
-    buf += read;
-  }
-  if (0 == key_len)
-  {
-    if ((NULL == it) && (NULL == op))
-    {
-      GNUNET_break (0);
-      force_reconnect (h);
-      return;
-    }
-    if (NULL != it)
-    {
-      if (NULL != it->finish_cb)
-        it->finish_cb (it->finish_cb_cls);
-      free_ait (it);
-    }
-    if (NULL != op)
-    {
-      if (NULL != op->at_cb)
-        op->at_cb (op->cls, NULL, NULL);
-      GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
-      free_op (op);
-    }
-    return;
-  }
-
-  {
-    struct GNUNET_RECLAIM_Credential *att;
-    att = GNUNET_RECLAIM_credential_deserialize (buf, att_len);
-
-    if (NULL != it)
-    {
-      if (NULL != it->proc)
-        it->proc (it->proc_cls, &identity, att);
-    }
-    else if (NULL != op)
-    {
-      if (NULL != op->at_cb)
-        op->at_cb (op->cls, &identity, att);
-    }
-    GNUNET_free (att);
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
-   * Handle an incoming message of type
-   * #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT
-   *
-   * @param cls
-   * @param msg the message we received
-   * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
-   */
-static int
-check_ticket_result (void *cls, const struct TicketResultMessage *msg)
-{
-  size_t msg_len;
-  size_t pres_len;
-  size_t tkt_len;
-
-  msg_len = ntohs (msg->header.size);
-  pres_len = ntohs (msg->presentations_len);
-  tkt_len = ntohs (msg->tkt_len);
-  if (msg_len != sizeof(*msg) + pres_len + tkt_len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT
- *
- * @param cls
- * @param msg the message we received
- */
-static void
-handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
-{
-  struct GNUNET_RECLAIM_Handle *handle = cls;
-  struct GNUNET_RECLAIM_Operation *op;
-  struct GNUNET_RECLAIM_TicketIterator *it;
-  struct GNUNET_RECLAIM_PresentationList *presentation;
-  uint32_t r_id = ntohl (msg->id);
-  struct GNUNET_RECLAIM_Ticket ticket;
-  size_t pres_len;
-  size_t tkt_len;
-  size_t tb_read;
-  char *buf;
-
-  tkt_len = ntohs (msg->tkt_len);
-  pres_len = ntohs (msg->presentations_len);
-  for (op = handle->op_head; NULL != op; op = op->next)
-    if (op->r_id == r_id)
-      break;
-  for (it = handle->ticket_it_head; NULL != it; it = it->next)
-    if (it->r_id == r_id)
-      break;
-  if ((NULL == op) && (NULL == it))
-    return;
-  buf = (char*) &msg[1];
-  GNUNET_assert (GNUNET_SYSERR !=
-                 GNUNET_RECLAIM_read_ticket_from_buffer (buf,
-                                                         tkt_len,
-                                                         &ticket,
-                                                         &tb_read));
-  buf += tb_read;
-  if (NULL != op)
-  {
-    if (0 < pres_len)
-      presentation = GNUNET_RECLAIM_presentation_list_deserialize (
-        buf,
-        pres_len);
-    GNUNET_CONTAINER_DLL_remove (handle->op_head, handle->op_tail, op);
-    if (0 == tb_read)
-    {
-      if (NULL != op->ti_cb)
-        op->ti_cb (op->cls, NULL, NULL);
-    }
-    else
-    {
-      if (NULL != op->ti_cb)
-        op->ti_cb (op->cls,
-                   &ticket,
-                   (0 < pres_len) ? presentation : NULL);
-    }
-    if (0 < pres_len)
-      GNUNET_RECLAIM_presentation_list_destroy (presentation);
-    free_op (op);
-    return;
-  }
-  else if (NULL != it)
-  {
-    if (0 == tkt_len)
-    {
-      GNUNET_CONTAINER_DLL_remove (handle->ticket_it_head,
-                                   handle->ticket_it_tail,
-                                   it);
-      it->finish_cb (it->finish_cb_cls);
-      GNUNET_free (it);
-    }
-    else
-    {
-      if (NULL != it->tr_cb)
-        it->tr_cb (it->cls, &ticket);
-    }
-    return;
-  }
-  GNUNET_break (0);
-}
-
-
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT
- *
- * @param cls
- * @param msg the message we received
- */
-static void
-handle_revoke_ticket_result (void *cls,
-                             const struct RevokeTicketResultMessage *msg)
-{
-  struct GNUNET_RECLAIM_Handle *h = cls;
-  struct GNUNET_RECLAIM_Operation *op;
-  uint32_t r_id = ntohl (msg->id);
-  int32_t success;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing revocation result.\n");
-
-
-  for (op = h->op_head; NULL != op; op = op->next)
-    if (op->r_id == r_id)
-      break;
-  if (NULL == op)
-    return;
-  success = ntohl (msg->success);
-  {
-    if (NULL != op->rvk_cb)
-    {
-      op->rvk_cb (op->cls, success, NULL);
-    }
-    GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
-    free_op (op);
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
- * Try again to connect to the service.
- *
- * @param h handle to the reclaim service.
- */
-static void
-reconnect (struct GNUNET_RECLAIM_Handle *h)
-{
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_fixed_size (success_response,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_SUCCESS_RESPONSE,
-                             struct SuccessResultMessage,
-                             h),
-    GNUNET_MQ_hd_var_size (attribute_result,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT,
-                           struct AttributeResultMessage,
-                           h),
-    GNUNET_MQ_hd_var_size (credential_result,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_RESULT,
-                           struct CredentialResultMessage,
-                           h),
-    GNUNET_MQ_hd_var_size (ticket_result,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT,
-                           struct TicketResultMessage,
-                           h),
-    GNUNET_MQ_hd_var_size (consume_ticket_result,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT,
-                           struct ConsumeTicketResultMessage,
-                           h),
-    GNUNET_MQ_hd_fixed_size (revoke_ticket_result,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT,
-                             struct RevokeTicketResultMessage,
-                             h),
-    GNUNET_MQ_handler_end () };
-  struct GNUNET_RECLAIM_Operation *op;
-
-  GNUNET_assert (NULL == h->mq);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to reclaim service.\n");
-
-  h->mq =
-    GNUNET_CLIENT_connect (h->cfg, "reclaim", handlers, &mq_error_handler, h);
-  if (NULL == h->mq)
-    return;
-  for (op = h->op_head; NULL != op; op = op->next)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-}
-
-
-/**
- * Connect to the reclaim service.
- *
- * @param cfg the configuration to use
- * @return handle to use
- */
-struct GNUNET_RECLAIM_Handle *
-GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_RECLAIM_Handle *h;
-
-  h = GNUNET_new (struct GNUNET_RECLAIM_Handle);
-  h->cfg = cfg;
-  reconnect (h);
-  if (NULL == h->mq)
-  {
-    GNUNET_free (h);
-    return NULL;
-  }
-  return h;
-}
-
-
-void
-GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op)
-{
-  struct GNUNET_RECLAIM_Handle *h = op->h;
-
-  GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
-  free_op (op);
-}
-
-
-/**
- * Disconnect from service
- *
- * @param h handle to destroy
- */
-void
-GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h)
-{
-  GNUNET_assert (NULL != h);
-  if (NULL != h->mq)
-  {
-    GNUNET_MQ_destroy (h->mq);
-    h->mq = NULL;
-  }
-  if (NULL != h->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (h->reconnect_task);
-    h->reconnect_task = NULL;
-  }
-  GNUNET_assert (NULL == h->op_head);
-  GNUNET_free (h);
-}
-
-
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_attribute_store (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *pkey,
-  const struct GNUNET_RECLAIM_Attribute *attr,
-  const struct GNUNET_TIME_Relative *exp_interval,
-  GNUNET_RECLAIM_ContinuationWithStatus cont,
-  void *cont_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct AttributeStoreMessage *sam;
-  size_t attr_len;
-  size_t key_len;
-  ssize_t written;
-  char *buf;
-
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->as_cb = cont;
-  op->cls = cont_cls;
-  op->r_id = h->r_id_gen++;
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  key_len = GNUNET_CRYPTO_private_key_get_length (pkey);
-  attr_len = GNUNET_RECLAIM_attribute_serialize_get_size (attr);
-  op->env = GNUNET_MQ_msg_extra (sam,
-                                 attr_len + key_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE);
-  sam->key_len = htons (key_len);
-  buf = (char *) &sam[1];
-  written = GNUNET_CRYPTO_write_private_key_to_buffer (pkey, buf, key_len);
-  GNUNET_assert (0 < written);
-  buf += written;
-  sam->id = htonl (op->r_id);
-  sam->exp = GNUNET_htonll (exp_interval->rel_value_us);
-
-  GNUNET_RECLAIM_attribute_serialize (attr, buf);
-
-  sam->attr_len = htons (attr_len);
-  if (NULL != h->mq)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-  return op;
-}
-
-
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_attribute_delete (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *pkey,
-  const struct GNUNET_RECLAIM_Attribute *attr,
-  GNUNET_RECLAIM_ContinuationWithStatus cont,
-  void *cont_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct AttributeDeleteMessage *dam;
-  size_t attr_len;
-  size_t key_len;
-  ssize_t written;
-  char *buf;
-
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->as_cb = cont;
-  op->cls = cont_cls;
-  op->r_id = h->r_id_gen++;
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  key_len = GNUNET_CRYPTO_private_key_get_length (pkey);
-  attr_len = GNUNET_RECLAIM_attribute_serialize_get_size (attr);
-  op->env = GNUNET_MQ_msg_extra (dam,
-                                 attr_len + key_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_DELETE);
-  dam->key_len = htons (key_len);
-  buf = (char *) &dam[1];
-  written = GNUNET_CRYPTO_write_private_key_to_buffer (pkey, buf, key_len);
-  GNUNET_assert (0 < written);
-  buf += written;
-  dam->id = htonl (op->r_id);
-  GNUNET_RECLAIM_attribute_serialize (attr, buf);
-
-  dam->attr_len = htons (attr_len);
-  if (NULL != h->mq)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-  return op;
-}
-
-
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_credential_store (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *pkey,
-  const struct GNUNET_RECLAIM_Credential *credential,
-  const struct GNUNET_TIME_Relative *exp_interval,
-  GNUNET_RECLAIM_ContinuationWithStatus cont,
-  void *cont_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct AttributeStoreMessage *sam;
-  size_t attr_len;
-  size_t key_len;
-  ssize_t written;
-  char *buf;
-
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->as_cb = cont;
-  op->cls = cont_cls;
-  op->r_id = h->r_id_gen++;
-  key_len = GNUNET_CRYPTO_private_key_get_length (pkey);
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  attr_len = GNUNET_RECLAIM_credential_serialize_get_size (credential);
-  op->env = GNUNET_MQ_msg_extra (sam,
-                                 attr_len + key_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_STORE);
-  sam->key_len = htons (key_len);
-  buf = (char *) &sam[1];
-  written = GNUNET_CRYPTO_write_private_key_to_buffer (pkey, buf, key_len);
-  GNUNET_assert (0 <= written);
-  buf += written;
-  sam->id = htonl (op->r_id);
-  sam->exp = GNUNET_htonll (exp_interval->rel_value_us);
-
-  GNUNET_RECLAIM_credential_serialize (credential, buf);
-
-  sam->attr_len = htons (attr_len);
-  if (NULL != h->mq)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-  return op;
-}
-
-
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_credential_delete (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *pkey,
-  const struct GNUNET_RECLAIM_Credential *attr,
-  GNUNET_RECLAIM_ContinuationWithStatus cont,
-  void *cont_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct AttributeDeleteMessage *dam;
-  size_t attr_len;
-  size_t key_len;
-  ssize_t written;
-  char *buf;
-
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->as_cb = cont;
-  op->cls = cont_cls;
-  op->r_id = h->r_id_gen++;
-  key_len = GNUNET_CRYPTO_private_key_get_length (pkey);
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  attr_len = GNUNET_RECLAIM_credential_serialize_get_size (attr);
-  op->env = GNUNET_MQ_msg_extra (dam,
-                                 attr_len + key_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_DELETE);
-  dam->key_len = htons (key_len);
-  buf = (char *) &dam[1];
-  written = GNUNET_CRYPTO_write_private_key_to_buffer (pkey, buf, key_len);
-  GNUNET_assert (0 <= written);
-  buf += written;
-  dam->id = htonl (op->r_id);
-  GNUNET_RECLAIM_credential_serialize (attr, buf);
-
-  dam->attr_len = htons (attr_len);
-  if (NULL != h->mq)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-  return op;
-}
-
-
-struct GNUNET_RECLAIM_AttributeIterator *
-GNUNET_RECLAIM_get_attributes_start (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  GNUNET_SCHEDULER_TaskCallback error_cb,
-  void *error_cb_cls,
-  GNUNET_RECLAIM_AttributeResult proc,
-  void *proc_cls,
-  GNUNET_SCHEDULER_TaskCallback finish_cb,
-  void *finish_cb_cls)
-{
-  struct GNUNET_RECLAIM_AttributeIterator *it;
-  struct GNUNET_MQ_Envelope *env;
-  struct AttributeIterationStartMessage *msg;
-  uint32_t rid;
-  size_t key_len;
-
-  rid = h->r_id_gen++;
-  it = GNUNET_new (struct GNUNET_RECLAIM_AttributeIterator);
-  it->h = h;
-  it->error_cb = error_cb;
-  it->error_cb_cls = error_cb_cls;
-  it->finish_cb = finish_cb;
-  it->finish_cb_cls = finish_cb_cls;
-  it->proc = proc;
-  it->proc_cls = proc_cls;
-  it->r_id = rid;
-  it->identity = *identity;
-  key_len = GNUNET_CRYPTO_private_key_get_length (identity);
-  GNUNET_CONTAINER_DLL_insert_tail (h->it_head, h->it_tail, it);
-  env =
-    GNUNET_MQ_msg_extra (msg,
-                         key_len,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START);
-  msg->id = htonl (rid);
-  msg->key_len = htons (key_len);
-  GNUNET_CRYPTO_write_private_key_to_buffer (identity, &msg[1], key_len);
-  if (NULL == h->mq)
-    it->env = env;
-  else
-    GNUNET_MQ_send (h->mq, env);
-  return it;
-}
-
-
-void
-GNUNET_RECLAIM_get_attributes_next (struct GNUNET_RECLAIM_AttributeIterator *it)
-{
-  struct GNUNET_RECLAIM_Handle *h = it->h;
-  struct AttributeIterationNextMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env =
-    GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT);
-  msg->id = htonl (it->r_id);
-  GNUNET_MQ_send (h->mq, env);
-}
-
-
-void
-GNUNET_RECLAIM_get_attributes_stop (struct GNUNET_RECLAIM_AttributeIterator *it)
-{
-  struct GNUNET_RECLAIM_Handle *h = it->h;
-  struct GNUNET_MQ_Envelope *env;
-  struct AttributeIterationStopMessage *msg;
-
-  if (NULL != h->mq)
-  {
-    env =
-      GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP);
-    msg->id = htonl (it->r_id);
-    GNUNET_MQ_send (h->mq, env);
-  }
-  free_it (it);
-}
-
-
-struct GNUNET_RECLAIM_CredentialIterator *
-GNUNET_RECLAIM_get_credentials_start (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  GNUNET_SCHEDULER_TaskCallback error_cb,
-  void *error_cb_cls,
-  GNUNET_RECLAIM_CredentialResult proc,
-  void *proc_cls,
-  GNUNET_SCHEDULER_TaskCallback finish_cb,
-  void *finish_cb_cls)
-{
-  struct GNUNET_RECLAIM_CredentialIterator *ait;
-  struct GNUNET_MQ_Envelope *env;
-  struct CredentialIterationStartMessage *msg;
-  uint32_t rid;
-  size_t key_len;
-
-  rid = h->r_id_gen++;
-  ait = GNUNET_new (struct GNUNET_RECLAIM_CredentialIterator);
-  ait->h = h;
-  ait->error_cb = error_cb;
-  ait->error_cb_cls = error_cb_cls;
-  ait->finish_cb = finish_cb;
-  ait->finish_cb_cls = finish_cb_cls;
-  ait->proc = proc;
-  ait->proc_cls = proc_cls;
-  ait->r_id = rid;
-  ait->identity = *identity;
-  key_len = GNUNET_CRYPTO_private_key_get_length (identity);
-  GNUNET_CONTAINER_DLL_insert_tail (h->ait_head, h->ait_tail, ait);
-  env =
-    GNUNET_MQ_msg_extra (msg,
-                         key_len,
-                         GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_ITERATION_START);
-  msg->id = htonl (rid);
-  msg->key_len = htons (key_len);
-  GNUNET_CRYPTO_write_private_key_to_buffer (identity, &msg[1], key_len);
-  if (NULL == h->mq)
-    ait->env = env;
-  else
-    GNUNET_MQ_send (h->mq, env);
-  return ait;
-}
-
-
-void
-GNUNET_RECLAIM_get_credentials_next (struct
-                                     GNUNET_RECLAIM_CredentialIterator *ait)
-{
-  struct GNUNET_RECLAIM_Handle *h = ait->h;
-  struct CredentialIterationNextMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env =
-    GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_ITERATION_NEXT);
-  msg->id = htonl (ait->r_id);
-  GNUNET_MQ_send (h->mq, env);
-}
-
-
-void
-GNUNET_RECLAIM_get_credentials_stop (struct
-                                     GNUNET_RECLAIM_CredentialIterator *ait)
-{
-  struct GNUNET_RECLAIM_Handle *h = ait->h;
-  struct GNUNET_MQ_Envelope *env;
-  struct CredentialIterationStopMessage *msg;
-
-  if (NULL != h->mq)
-  {
-    env =
-      GNUNET_MQ_msg (msg,
-                     GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_ITERATION_STOP);
-    msg->id = htonl (ait->r_id);
-    GNUNET_MQ_send (h->mq, env);
-  }
-  free_ait (ait);
-}
-
-
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_ticket_issue (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *iss,
-  const struct GNUNET_CRYPTO_PublicKey *rp,
-  const struct GNUNET_RECLAIM_AttributeList *attrs,
-  GNUNET_RECLAIM_IssueTicketCallback cb,
-  void *cb_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct IssueTicketMessage *tim;
-  size_t attr_len;
-  size_t key_len;
-  size_t rpk_len;
-  ssize_t written;
-  char *buf;
-
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->ti_cb = cb;
-  op->cls = cb_cls;
-  op->r_id = h->r_id_gen++;
-  key_len = GNUNET_CRYPTO_private_key_get_length (iss);
-  rpk_len = GNUNET_CRYPTO_public_key_get_length (rp);
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  attr_len = GNUNET_RECLAIM_attribute_list_serialize_get_size (attrs);
-  op->env = GNUNET_MQ_msg_extra (tim,
-                                 attr_len + key_len + rpk_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET);
-  tim->key_len = htons (key_len);
-  tim->pkey_len = htons (rpk_len);
-  buf = (char *) &tim[1];
-  written = GNUNET_CRYPTO_write_private_key_to_buffer (iss, buf, key_len);
-  GNUNET_assert (0 <= written);
-  buf += written;
-  written = GNUNET_CRYPTO_write_public_key_to_buffer (rp, buf, rpk_len);
-  GNUNET_assert (0 <= written);
-  buf += written;
-  tim->id = htonl (op->r_id);
-
-  GNUNET_RECLAIM_attribute_list_serialize (attrs, buf);
-  tim->attr_len = htons (attr_len);
-  if (NULL != h->mq)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-  return op;
-}
-
-
-/**
- * Consumes an issued ticket. The ticket is persisted
- * and used to retrieve identity information from the issuer
- *
- * @param h the reclaim to use
- * @param identity the identity that is the subject of the issued ticket (the
- * relying party)
- * @param ticket the issued ticket to consume
- * @param cb the callback to call
- * @param cb_cls the callback closure
- * @return handle to abort the operation
- */
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_ticket_consume (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  const struct GNUNET_RECLAIM_Ticket *ticket,
-  GNUNET_RECLAIM_AttributeTicketResult cb,
-  void *cb_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct ConsumeTicketMessage *ctm;
-  size_t key_len;
-  size_t tkt_len;
-  char *buf;
-
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->atr_cb = cb;
-  op->cls = cb_cls;
-  op->r_id = h->r_id_gen++;
-  key_len = GNUNET_CRYPTO_private_key_get_length (identity);
-  tkt_len = GNUNET_RECLAIM_ticket_serialize_get_size (ticket);
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  op->env = GNUNET_MQ_msg_extra (ctm,
-                                 key_len + tkt_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET);
-  ctm->key_len = htons (key_len);
-  buf = (char*) &ctm[1];
-  GNUNET_CRYPTO_write_private_key_to_buffer (identity, buf, key_len);
-  buf += key_len;
-  ctm->tkt_len = htons (tkt_len);
-  GNUNET_RECLAIM_write_ticket_to_buffer (ticket, buf, tkt_len);
-  ctm->id = htonl (op->r_id);
-  if (NULL != h->mq)
-    GNUNET_MQ_send_copy (h->mq, op->env);
-  else
-    reconnect (h);
-  return op;
-}
-
-
-struct GNUNET_RECLAIM_TicketIterator *
-GNUNET_RECLAIM_ticket_iteration_start (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  GNUNET_SCHEDULER_TaskCallback error_cb,
-  void *error_cb_cls,
-  GNUNET_RECLAIM_TicketCallback proc,
-  void *proc_cls,
-  GNUNET_SCHEDULER_TaskCallback finish_cb,
-  void *finish_cb_cls)
-{
-  struct GNUNET_RECLAIM_TicketIterator *it;
-  struct GNUNET_MQ_Envelope *env;
-  struct TicketIterationStartMessage *msg;
-  uint32_t rid;
-  size_t key_len;
-
-  rid = h->r_id_gen++;
-  it = GNUNET_new (struct GNUNET_RECLAIM_TicketIterator);
-  it->h = h;
-  it->error_cb = error_cb;
-  it->error_cb_cls = error_cb_cls;
-  it->finish_cb = finish_cb;
-  it->finish_cb_cls = finish_cb_cls;
-  it->tr_cb = proc;
-  it->cls = proc_cls;
-  it->r_id = rid;
-
-  key_len = GNUNET_CRYPTO_private_key_get_length (identity);
-  GNUNET_CONTAINER_DLL_insert_tail (h->ticket_it_head, h->ticket_it_tail, it);
-  env = GNUNET_MQ_msg_extra (msg,
-                             key_len,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START);
-  msg->id = htonl (rid);
-  msg->key_len = htons (key_len);
-  GNUNET_CRYPTO_write_private_key_to_buffer (identity,
-                                               &msg[1],
-                                               key_len);
-  if (NULL == h->mq)
-    it->env = env;
-  else
-    GNUNET_MQ_send (h->mq, env);
-  return it;
-}
-
-
-/**
- * Calls the ticket processor specified in
- * #GNUNET_RECLAIM_ticket_iteration_start for the next record.
- *
- * @param it the iterator
- */
-void
-GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it)
-{
-  struct GNUNET_RECLAIM_Handle *h = it->h;
-  struct TicketIterationNextMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT);
-  msg->id = htonl (it->r_id);
-  GNUNET_MQ_send (h->mq, env);
-}
-
-
-/**
- * Stops iteration and releases the handle for further calls.  Must
- * be called on any iteration that has not yet completed prior to calling
- * #GNUNET_RECLAIM_disconnect.
- *
- * @param it the iterator
- */
-void
-GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it)
-{
-  struct GNUNET_RECLAIM_Handle *h = it->h;
-  struct GNUNET_MQ_Envelope *env;
-  struct TicketIterationStopMessage *msg;
-
-  if (NULL != h->mq)
-  {
-    env =
-      GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP);
-    msg->id = htonl (it->r_id);
-    GNUNET_MQ_send (h->mq, env);
-  }
-  GNUNET_free (it);
-}
-
-
-/**
- * Revoked an issued ticket. The relying party will be unable to retrieve
- * attributes. Other issued tickets remain unaffected.
- * This includes tickets issued to other relying parties as well as to
- * other tickets issued to the audience specified in this ticket.
- *
- * @param h the identity provider to use
- * @param identity the issuing identity
- * @param ticket the ticket to revoke
- * @param cb the callback
- * @param cb_cls the callback closure
- * @return handle to abort the operation
- */
-struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_ticket_revoke (
-  struct GNUNET_RECLAIM_Handle *h,
-  const struct GNUNET_CRYPTO_PrivateKey *identity,
-  const struct GNUNET_RECLAIM_Ticket *ticket,
-  GNUNET_RECLAIM_ContinuationWithStatus cb,
-  void *cb_cls)
-{
-  struct GNUNET_RECLAIM_Operation *op;
-  struct RevokeTicketMessage *msg;
-  uint32_t rid;
-  size_t key_len;
-  size_t tkt_len;
-  ssize_t written;
-  char *buf;
-
-  rid = h->r_id_gen++;
-  op = GNUNET_new (struct GNUNET_RECLAIM_Operation);
-  op->h = h;
-  op->rvk_cb = cb;
-  op->cls = cb_cls;
-  op->r_id = rid;
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  key_len = GNUNET_CRYPTO_private_key_get_length (identity);
-  tkt_len = GNUNET_RECLAIM_ticket_serialize_get_size (ticket);
-  op->env = GNUNET_MQ_msg_extra (msg,
-                                 key_len + tkt_len,
-                                 GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET);
-  msg->id = htonl (rid);
-  msg->key_len = htons (key_len);
-  msg->tkt_len = htons (tkt_len);
-  buf = (char*) &msg[1];
-  written = GNUNET_CRYPTO_write_private_key_to_buffer (identity,
-                                                         buf,
-                                                         key_len);
-  GNUNET_assert (0 <= written);
-  buf += written;
-  GNUNET_RECLAIM_write_ticket_to_buffer (ticket,
-                                         buf,
-                                         tkt_len);
-  if (NULL != h->mq)
-  {
-    GNUNET_MQ_send (h->mq, op->env);
-    op->env = NULL;
-  }
-  return op;
-}
-
-size_t
-GNUNET_RECLAIM_ticket_serialize_get_size (const struct
-                                          GNUNET_RECLAIM_Ticket *tkt)
-{
-  size_t size = sizeof (tkt->rnd);
-  size += GNUNET_CRYPTO_public_key_get_length (&tkt->identity);
-  size += GNUNET_CRYPTO_public_key_get_length (&tkt->audience);
-  return size;
-}
-
-enum GNUNET_GenericReturnValue
-GNUNET_RECLAIM_read_ticket_from_buffer (const void *buffer,
-                                        size_t len,
-                                        struct GNUNET_RECLAIM_Ticket *tkt,
-                                        size_t *tb_read)
-{
-  const char *tmp = buffer;
-  size_t read = 0;
-  size_t left = len;
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_read_public_key_from_buffer (tmp,
-                                                   left,
-                                                   &tkt->identity,
-                                                   &read))
-    return GNUNET_SYSERR;
-  left -= read;
-  tmp += read;
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_read_public_key_from_buffer (tmp,
-                                                   left,
-                                                   &tkt->audience,
-                                                   &read))
-    return GNUNET_SYSERR;
-  left -= read;
-  tmp += read;
-  if (left < sizeof (tkt->rnd))
-    return GNUNET_SYSERR;
-  memcpy (&tkt->rnd, tmp, sizeof (tkt->rnd));
-  *tb_read = tmp - (char*) buffer + sizeof (tkt->rnd);
-  return GNUNET_OK;
-}
-
-
-ssize_t
-GNUNET_RECLAIM_write_ticket_to_buffer (const struct
-                                       GNUNET_RECLAIM_Ticket *tkt,
-                                       void *buffer,
-                                       size_t len)
-{
-  char *tmp = buffer;
-  size_t left = len;
-  ssize_t written = 0;
-  written = GNUNET_CRYPTO_write_public_key_to_buffer (&tkt->identity,
-                                                        buffer,
-                                                        left);
-  if (0 > written)
-    return written;
-  left -= written;
-  tmp += written;
-  written = GNUNET_CRYPTO_write_public_key_to_buffer (&tkt->audience,
-                                                        tmp,
-                                                        left);
-  if (0 > written)
-    return written;
-  left -= written;
-  tmp += written;
-  if (left < sizeof (tkt->rnd))
-    return -1;
-  memcpy (tmp, &tkt->rnd, sizeof (tkt->rnd));
-  return tmp - (char*) buffer + sizeof (tkt->rnd);
-}
-
-
-
-/* end of reclaim_api.c */
diff --git a/src/reclaim/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c
deleted file mode 100644
index b235ed945..000000000
--- a/src/reclaim/reclaim_attribute.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim-attribute/reclaim_attribute.c
- * @brief helper library to manage identity attributes
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_plugin.h"
-#include "reclaim_attribute.h"
-
-
-/**
- * Handle for a plugin
- */
-struct Plugin
-{
-  /**
-   * Name of the plugin
-   */
-  char *library_name;
-
-  /**
-   * Plugin API
-   */
-  struct GNUNET_RECLAIM_AttributePluginFunctions *api;
-};
-
-
-/**
- * Plugins
- */
-static struct Plugin **attr_plugins;
-
-
-/**
- * Number of plugins
- */
-static unsigned int num_plugins;
-
-
-/**
- * Init canary
- */
-static int initialized;
-
-
-/**
- * Add a plugin
- *
- * @param cls closure
- * @param library_name name of the API library
- * @param lib_ret the plugin API pointer
- */
-static void
-add_plugin (void *cls, const char *library_name, void *lib_ret)
-{
-  struct GNUNET_RECLAIM_AttributePluginFunctions *api = lib_ret;
-  struct Plugin *plugin;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Loading attribute plugin `%s'\n",
-              library_name);
-  plugin = GNUNET_new (struct Plugin);
-  plugin->api = api;
-  plugin->library_name = GNUNET_strdup (library_name);
-  GNUNET_array_append (attr_plugins, num_plugins, plugin);
-}
-
-
-/**
- * Load plugins
- */
-static void
-init ()
-{
-  if (GNUNET_YES == initialized)
-    return;
-  initialized = GNUNET_YES;
-  GNUNET_PLUGIN_load_all_in_context (GNUNET_OS_project_data_default (),
-                                     "libgnunet_plugin_reclaim_attribute_",
-                                     NULL,
-                                     &add_plugin,
-                                     NULL);
-}
-
-/**
- * Dual function to #init().
- */
-void __attribute__ ((destructor))
-RECLAIM_ATTRIBUTE_fini ()
-{
-  struct Plugin *plugin;
-  const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
-  const struct GNUNET_OS_ProjectData *dpd = GNUNET_OS_project_data_default ();
-
-  if (pd != dpd)
-    GNUNET_OS_init (dpd);
-
-  for (unsigned int i = 0; i < num_plugins; i++)
-  {
-    plugin = attr_plugins[i];
-    GNUNET_break (NULL ==
-                  GNUNET_PLUGIN_unload (plugin->library_name,
-                                        plugin->api));
-    GNUNET_free (plugin->library_name);
-    GNUNET_free (plugin);
-  }
-  GNUNET_free (attr_plugins);
-
-  if (pd != dpd)
-    GNUNET_OS_init (pd);
-
-  attr_plugins = NULL;
-}
-
-
-
-/**
- * Convert a type name to the corresponding number
- *
- * @param typename name to convert
- * @return corresponding number, UINT32_MAX on error
- */
-uint32_t
-GNUNET_RECLAIM_attribute_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 (plugin->api->cls, typename)))
-      return ret;
-  }
-  return UINT32_MAX;
-}
-
-
-/**
- * Convert a type number to the corresponding type string
- *
- * @param type number of a type
- * @return corresponding typestring, NULL on error
- */
-const char *
-GNUNET_RECLAIM_attribute_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 (plugin->api->cls, type)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-/**
- * Convert human-readable version of a 'claim' of an attribute 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_attribute_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 (plugin->api->cls,
-                                                   type,
-                                                   s,
-                                                   data,
-                                                   data_size))
-      return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert the 'claim' of an attribute to a string
- *
- * @param type the type of attribute
- * @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_attribute_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 (plugin->api->cls,
-                                                     type,
-                                                     data,
-                                                     data_size)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-struct GNUNET_RECLAIM_Attribute *
-GNUNET_RECLAIM_attribute_new (const char *attr_name,
-                              const struct
-                              GNUNET_RECLAIM_Identifier *credential,
-                              uint32_t type,
-                              const void *data,
-                              size_t data_size)
-{
-  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)
-                        + strlen (attr_name_tmp) + 1 + data_size);
-  if (NULL != credential)
-    attr->credential = *credential;
-  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;
-}
-
-
-void
-GNUNET_RECLAIM_attribute_list_add (
-  struct GNUNET_RECLAIM_AttributeList *al,
-  const char *attr_name,
-  const struct GNUNET_RECLAIM_Identifier *credential,
-  uint32_t type,
-  const void *data,
-  size_t data_size)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-
-  ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-  ale->attribute =
-    GNUNET_RECLAIM_attribute_new (attr_name, credential,
-                                  type, data, data_size);
-  GNUNET_CONTAINER_DLL_insert (al->list_head,
-                               al->list_tail,
-                               ale);
-}
-
-
-/**
- * Get required size for serialization buffer
- *
- * @param attrs the attribute list to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_attribute_list_serialize_get_size (
-  const struct GNUNET_RECLAIM_AttributeList *al)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  size_t len = 0;
-
-  for (ale = al->list_head; NULL != ale; ale = ale->next)
-  {
-    GNUNET_assert (NULL != ale->attribute);
-    len += GNUNET_RECLAIM_attribute_serialize_get_size (ale->attribute);
-  }
-  return len;
-}
-
-
-size_t
-GNUNET_RECLAIM_attribute_list_serialize (
-  const struct GNUNET_RECLAIM_AttributeList *attrs,
-  char *result)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  size_t len;
-  size_t total_len;
-  char *write_ptr;
-  write_ptr = result;
-  total_len = 0;
-  for (ale = attrs->list_head; NULL != ale; ale = ale->next)
-  {
-    GNUNET_assert (NULL != ale->attribute);
-    len = GNUNET_RECLAIM_attribute_serialize (ale->attribute, write_ptr);
-    total_len += len;
-    write_ptr += len;
-  }
-  return total_len;
-}
-
-
-/**
- * Deserialize an attribute list
- *
- * @param data the serialized attribute list
- * @param data_size the length of the serialized data
- * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
- */
-struct GNUNET_RECLAIM_AttributeList *
-GNUNET_RECLAIM_attribute_list_deserialize (const char *data, size_t data_size)
-{
-  struct GNUNET_RECLAIM_AttributeList *al;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  size_t attr_len;
-  const char *read_ptr;
-  size_t left = data_size;
-
-  al = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  if (data_size < sizeof(struct Attribute))
-    return al;
-  read_ptr = data;
-  while (left >= sizeof(struct Attribute))
-  {
-    ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    attr_len =
-      GNUNET_RECLAIM_attribute_deserialize (read_ptr,
-                                            left,
-                                            &ale->attribute);
-    if (-1 == attr_len)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to deserialize malformed attribute.\n");
-      GNUNET_free (ale);
-      return al;
-    }
-    left -= attr_len;
-    GNUNET_CONTAINER_DLL_insert (al->list_head, al->list_tail, ale);
-    read_ptr += attr_len;
-  }
-  return al;
-}
-
-
-struct GNUNET_RECLAIM_AttributeList *
-GNUNET_RECLAIM_attribute_list_dup (
-  const struct GNUNET_RECLAIM_AttributeList *attrs)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_RECLAIM_AttributeListEntry *result_ale;
-  struct GNUNET_RECLAIM_AttributeList *result;
-
-  result = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  for (ale = attrs->list_head; NULL != ale; ale = ale->next)
-  {
-    result_ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    GNUNET_assert (NULL != ale->attribute);
-    {
-      result_ale->attribute =
-        GNUNET_RECLAIM_attribute_new (ale->attribute->name,
-                                      &ale->attribute->credential,
-                                      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_ale);
-  }
-  return result;
-}
-
-
-void
-GNUNET_RECLAIM_attribute_list_destroy (
-  struct GNUNET_RECLAIM_AttributeList *al)
-{
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  struct GNUNET_RECLAIM_AttributeListEntry *tmp_ale;
-
-  for (ale = al->list_head; NULL != ale;)
-  {
-    if (NULL != ale->attribute)
-      GNUNET_free (ale->attribute);
-    tmp_ale = ale;
-    ale = ale->next;
-    GNUNET_free (tmp_ale);
-  }
-  GNUNET_free (al);
-}
-
-
-/**
- * Get required size for serialization buffer
- *
- * @param attr the attribute to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_attribute_serialize_get_size (
-  const struct GNUNET_RECLAIM_Attribute *attr)
-{
-  return sizeof(struct Attribute) + strlen (attr->name) + attr->data_size;
-}
-
-
-/**
- * Serialize an attribute
- *
- * @param attr the attribute to serialize
- * @param result the serialized attribute
- * @return length of serialized data
- */
-size_t
-GNUNET_RECLAIM_attribute_serialize (
-  const struct GNUNET_RECLAIM_Attribute *attr,
-  char *result)
-{
-  size_t data_len_ser;
-  size_t name_len;
-  struct Attribute *attr_ser;
-  char *write_ptr;
-
-  attr_ser = (struct Attribute *) result;
-  attr_ser->attribute_type = htonl (attr->type);
-  attr_ser->attribute_flag = htonl (attr->flag);
-  attr_ser->attribute_id = attr->id;
-  attr_ser->credential_id = attr->credential;
-  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 Attribute) + strlen (attr->name) + attr->data_size;
-}
-
-
-/**
- * Deserialize an attribute
- *
- * @param data the serialized attribute
- * @param data_size the length of the serialized data
- *
- * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
- */
-ssize_t
-GNUNET_RECLAIM_attribute_deserialize (const char *data, size_t data_size,
-                                      struct GNUNET_RECLAIM_Attribute **attr)
-{
-  struct Attribute *attr_ser;
-  struct GNUNET_RECLAIM_Attribute *attribute;
-  size_t data_len;
-  size_t name_len;
-  char *write_ptr;
-
-  if (data_size < sizeof(struct Attribute))
-    return -1;
-
-  attr_ser = (struct Attribute *) data;
-  data_len = ntohs (attr_ser->data_size);
-  name_len = ntohs (attr_ser->name_len);
-  if (data_size < sizeof(struct Attribute) + data_len + name_len)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Buffer too small to deserialize\n");
-    return -1;
-  }
-  attribute = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_Attribute)
-                        + data_len + name_len + 1);
-  attribute->type = ntohl (attr_ser->attribute_type);
-  attribute->flag = ntohl (attr_ser->attribute_flag);
-  attribute->id = attr_ser->attribute_id;
-  attribute->credential = attr_ser->credential_id;
-  attribute->data_size = data_len;
-
-  write_ptr = (char *) &attribute[1];
-  GNUNET_memcpy (write_ptr, &attr_ser[1], name_len);
-  write_ptr[name_len] = '\0';
-  attribute->name = write_ptr;
-
-  write_ptr += name_len + 1;
-  GNUNET_memcpy (write_ptr, (char *) &attr_ser[1] + name_len,
-                attribute->data_size);
-  *attr = attribute;
-  attribute->data = write_ptr;
-  return sizeof(struct Attribute) + data_len + name_len;
-}
-
-
-/* end of reclaim_attribute.c */
diff --git a/src/reclaim/reclaim_attribute.h b/src/reclaim/reclaim_attribute.h
deleted file mode 100644
index 44d85e61c..000000000
--- a/src/reclaim/reclaim_attribute.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @file reclaim-attribute/reclaim_attribute.h
- * @brief GNUnet reclaim identity attributes
- *
- */
-#ifndef RECLAIM_ATTRIBUTE_H
-#define RECLAIM_ATTRIBUTE_H
-
-#include "gnunet_reclaim_service.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Serialized claim
- */
-struct Attribute
-{
-  /**
-   * Attribute type
-   */
-  uint32_t attribute_type GNUNET_PACKED;
-
-  /**
-   * Attribute flag
-   */
-  uint32_t attribute_flag GNUNET_PACKED;
-
-  /**
-   * Attribute ID
-   */
-  struct GNUNET_RECLAIM_Identifier attribute_id;
-
-  /**
-   * Credential ID
-   */
-  struct GNUNET_RECLAIM_Identifier credential_id;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved_nl GNUNET_PACKED;
-
-  /**
-   * Name length
-   */
-  uint16_t name_len GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved_ds GNUNET_PACKED;
-
-  /**
-   * Data size
-   */
-  uint16_t data_size GNUNET_PACKED;
-
-  // followed by data_size Attribute value data
-};
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-#endif
diff --git a/src/reclaim/reclaim_credential.c b/src/reclaim/reclaim_credential.c
deleted file mode 100644
index 1aad261a1..000000000
--- a/src/reclaim/reclaim_credential.c
+++ /dev/null
@@ -1,1004 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/reclaim_credential.c
- * @brief helper library to manage identity attribute credentials
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_plugin.h"
-#include "reclaim_credential.h"
-
-
-/**
- * Handle for a plugin
- */
-struct Plugin
-{
-  /**
-   * Name of the plugin
-   */
-  char *library_name;
-
-  /**
-   * Plugin API
-   */
-  struct GNUNET_RECLAIM_CredentialPluginFunctions *api;
-};
-
-
-/**
- * Plugins
- */
-static struct Plugin **credential_plugins;
-
-
-/**
- * Number of plugins
- */
-static unsigned int num_plugins;
-
-
-/**
- * Init canary
- */
-static int initialized;
-
-
-/**
- * Add a plugin
- *
- * @param cls closure
- * @param library_name name of the API library
- * @param lib_ret the plugin API pointer
- */
-static void
-add_plugin (void *cls, const char *library_name, void *lib_ret)
-{
-  struct GNUNET_RECLAIM_CredentialPluginFunctions *api = lib_ret;
-  struct Plugin *plugin;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Loading credential plugin `%s'\n",
-              library_name);
-  plugin = GNUNET_new (struct Plugin);
-  plugin->api = api;
-  plugin->library_name = GNUNET_strdup (library_name);
-  GNUNET_array_append (credential_plugins, num_plugins, plugin);
-}
-
-
-/**
- * Load plugins
- */
-static void
-init ()
-{
-  if (GNUNET_YES == initialized)
-    return;
-  initialized = GNUNET_YES;
-  GNUNET_PLUGIN_load_all_in_context (GNUNET_OS_project_data_default (),
-                                     "libgnunet_plugin_reclaim_credential_",
-                                     NULL,
-                                     &add_plugin,
-                                     NULL);
-}
-
-
-/**
- * Dual function to #init().
- */
-void __attribute__ ((destructor))
-RECLAIM_CREDENTIAL_fini ()
-{
-  struct Plugin *plugin;
-  const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
-  const struct GNUNET_OS_ProjectData *dpd = GNUNET_OS_project_data_default ();
-
-  if (pd != dpd)
-    GNUNET_OS_init (dpd);
-
-  for (unsigned int i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    GNUNET_break (NULL ==
-                  GNUNET_PLUGIN_unload (plugin->library_name,
-                                        plugin->api));
-    GNUNET_free (plugin->library_name);
-    GNUNET_free (plugin);
-  }
-  GNUNET_free (credential_plugins);
-
-  if (pd != dpd)
-    GNUNET_OS_init (pd);
-
-  credential_plugins = NULL;
-}
-
-
-/**
- * Convert an credential type name to the corresponding number
- *
- * @param typename name to convert
- * @return corresponding number, UINT32_MAX on error
- */
-uint32_t
-GNUNET_RECLAIM_credential_typename_to_number (const char *typename)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  uint32_t ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (UINT32_MAX !=
-        (ret = plugin->api->typename_to_number (plugin->api->cls,
-                                                typename)))
-      return ret;
-  }
-  return UINT32_MAX;
-}
-
-
-/**
- * Convert an credential type number to the corresponding credential type string
- *
- * @param type number of a type
- * @return corresponding typestring, NULL on error
- */
-const char *
-GNUNET_RECLAIM_credential_number_to_typename (uint32_t type)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  const char *ret;
-
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->number_to_typename (plugin->api->cls, type)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-/**
- * Convert human-readable version of a 'claim' of an credential 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_credential_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 = credential_plugins[i];
-    if (GNUNET_OK == plugin->api->string_to_value (plugin->api->cls,
-                                                   type,
-                                                   s,
-                                                   data,
-                                                   data_size))
-      return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert the 'claim' of an credential to a string
- *
- * @param type the type of credential
- * @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_credential_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 = credential_plugins[i];
-    if (NULL != (ret = plugin->api->value_to_string (plugin->api->cls,
-                                                     type,
-                                                     data,
-                                                     data_size)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-struct GNUNET_RECLAIM_Credential *
-GNUNET_RECLAIM_credential_new (const char *attr_name,
-                               uint32_t type,
-                               const void *data,
-                               size_t data_size)
-{
-  struct GNUNET_RECLAIM_Credential *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_Credential)
-                        + 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;
-}
-
-
-/**
- * Get required size for serialization buffer
- *
- * @param attrs the attribute list to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_credential_list_serialize_get_size (
-  const struct GNUNET_RECLAIM_CredentialList *credentials)
-{
-  struct GNUNET_RECLAIM_CredentialListEntry *le;
-  size_t len = 0;
-
-  for (le = credentials->list_head; NULL != le; le = le->next)
-  {
-    GNUNET_assert (NULL != le->credential);
-    len += GNUNET_RECLAIM_credential_serialize_get_size (le->credential);
-    len += sizeof(struct GNUNET_RECLAIM_CredentialListEntry);
-  }
-  return len;
-}
-
-
-size_t
-GNUNET_RECLAIM_credential_list_serialize (
-  const struct GNUNET_RECLAIM_CredentialList *credentials,
-  char *result)
-{
-  struct GNUNET_RECLAIM_CredentialListEntry *le;
-  size_t len;
-  size_t total_len;
-  char *write_ptr;
-  write_ptr = result;
-  total_len = 0;
-  for (le = credentials->list_head; NULL != le; le = le->next)
-  {
-    GNUNET_assert (NULL != le->credential);
-    len = GNUNET_RECLAIM_credential_serialize (le->credential, write_ptr);
-    total_len += len;
-    write_ptr += len;
-  }
-  return total_len;
-}
-
-
-struct GNUNET_RECLAIM_CredentialList *
-GNUNET_RECLAIM_credential_list_deserialize (const char *data, size_t data_size)
-{
-  struct GNUNET_RECLAIM_CredentialList *al;
-  struct GNUNET_RECLAIM_CredentialListEntry *ale;
-  size_t att_len;
-  const char *read_ptr;
-
-  al = GNUNET_new (struct GNUNET_RECLAIM_CredentialList);
-
-  if ((data_size < sizeof(struct
-                          Credential)
-       + sizeof(struct GNUNET_RECLAIM_CredentialListEntry)))
-    return al;
-
-  read_ptr = data;
-  while (((data + data_size) - read_ptr) >= sizeof(struct Credential))
-  {
-    ale = GNUNET_new (struct GNUNET_RECLAIM_CredentialListEntry);
-    ale->credential =
-      GNUNET_RECLAIM_credential_deserialize (read_ptr,
-                                             data_size - (read_ptr - data));
-    if (NULL == ale->credential)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to deserialize malformed credential.\n");
-      GNUNET_free (ale);
-      return al;
-    }
-    GNUNET_CONTAINER_DLL_insert (al->list_head, al->list_tail, ale);
-    att_len = GNUNET_RECLAIM_credential_serialize_get_size (ale->credential);
-    read_ptr += att_len;
-  }
-  return al;
-}
-
-
-/**
- * Make a (deep) copy of the credential list
- * @param attrs claim list to copy
- * @return copied claim list
- */
-struct GNUNET_RECLAIM_CredentialList *
-GNUNET_RECLAIM_credential_list_dup (
-  const struct GNUNET_RECLAIM_CredentialList *al)
-{
-  struct GNUNET_RECLAIM_CredentialListEntry *ale;
-  struct GNUNET_RECLAIM_CredentialListEntry *result_ale;
-  struct GNUNET_RECLAIM_CredentialList *result;
-
-  result = GNUNET_new (struct GNUNET_RECLAIM_CredentialList);
-  for (ale = al->list_head; NULL != ale; ale = ale->next)
-  {
-    result_ale = GNUNET_new (struct GNUNET_RECLAIM_CredentialListEntry);
-    GNUNET_assert (NULL != ale->credential);
-    result_ale->credential =
-      GNUNET_RECLAIM_credential_new (ale->credential->name,
-                                     ale->credential->type,
-                                     ale->credential->data,
-                                     ale->credential->data_size);
-    result_ale->credential->id = ale->credential->id;
-    GNUNET_CONTAINER_DLL_insert (result->list_head,
-                                 result->list_tail,
-                                 result_ale);
-  }
-  return result;
-}
-
-
-void
-GNUNET_RECLAIM_credential_list_destroy (
-  struct GNUNET_RECLAIM_CredentialList *credentials)
-{
-  struct GNUNET_RECLAIM_CredentialListEntry *ale;
-  struct GNUNET_RECLAIM_CredentialListEntry *tmp_ale;
-
-  for (ale = credentials->list_head; NULL != ale;)
-  {
-    if (NULL != ale->credential)
-      GNUNET_free (ale->credential);
-    tmp_ale = ale;
-    ale = ale->next;
-    GNUNET_free (tmp_ale);
-  }
-  GNUNET_free (credentials);
-}
-
-
-/**
- * Get required size for serialization buffer
- *
- * @param attr the credential to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_credential_serialize_get_size (
-  const struct GNUNET_RECLAIM_Credential *credential)
-{
-  return sizeof(struct Credential) + strlen (credential->name)
-         + credential->data_size;
-}
-
-
-size_t
-GNUNET_RECLAIM_credential_serialize (
-  const struct GNUNET_RECLAIM_Credential *credential,
-  char *result)
-{
-  size_t data_len_ser;
-  size_t name_len;
-  struct Credential *atts;
-  char *write_ptr;
-
-  atts = (struct Credential *) result;
-  atts->credential_type = htonl (credential->type);
-  atts->credential_flag = htonl (credential->flag);
-  atts->credential_id = credential->id;
-  name_len = strlen (credential->name);
-  atts->name_len = htons (name_len);
-  write_ptr = (char *) &atts[1];
-  GNUNET_memcpy (write_ptr, credential->name, name_len);
-  write_ptr += name_len;
-  // TODO plugin-ize
-  // data_len_ser = plugin->serialize_attribute_value (attr,
-  //                                                  &attr_ser[1]);
-  data_len_ser = credential->data_size;
-  GNUNET_memcpy (write_ptr, credential->data, credential->data_size);
-  atts->data_size = htons (data_len_ser);
-
-  return sizeof(struct Credential) + strlen (credential->name)
-         + credential->data_size;
-}
-
-
-/**
- * Deserialize an credential
- *
- * @param data the serialized credential
- * @param data_size the length of the serialized data
- *
- * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
- */
-struct GNUNET_RECLAIM_Credential *
-GNUNET_RECLAIM_credential_deserialize (const char *data, size_t data_size)
-{
-  struct GNUNET_RECLAIM_Credential *credential;
-  struct Credential *atts;
-  size_t data_len;
-  size_t name_len;
-  char *write_ptr;
-
-  if (data_size < sizeof(struct Credential))
-    return NULL;
-
-  atts = (struct Credential *) data;
-  data_len = ntohs (atts->data_size);
-  name_len = ntohs (atts->name_len);
-  if (data_size < sizeof(struct Credential) + data_len + name_len)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Buffer too small to deserialize\n");
-    return NULL;
-  }
-  credential = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_Credential)
-                              + data_len + name_len + 1);
-  credential->type = ntohl (atts->credential_type);
-  credential->flag = ntohl (atts->credential_flag);
-  credential->id = atts->credential_id;
-  credential->data_size = data_len;
-
-  write_ptr = (char *) &credential[1];
-  GNUNET_memcpy (write_ptr, &atts[1], name_len);
-  write_ptr[name_len] = '\0';
-  credential->name = write_ptr;
-
-  write_ptr += name_len + 1;
-  GNUNET_memcpy (write_ptr, (char *) &atts[1] + name_len,
-                 credential->data_size);
-  credential->data = write_ptr;
-  return credential;
-}
-
-
-struct GNUNET_RECLAIM_AttributeList*
-GNUNET_RECLAIM_credential_get_attributes (const struct
-                                          GNUNET_RECLAIM_Credential *credential)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  struct GNUNET_RECLAIM_AttributeList *ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->get_attributes (plugin->api->cls,
-                                            credential)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-char*
-GNUNET_RECLAIM_credential_get_issuer (const struct
-                                      GNUNET_RECLAIM_Credential *credential)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  char *ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->get_issuer (plugin->api->cls,
-                                        credential)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-int
-GNUNET_RECLAIM_credential_get_expiration (const struct
-                                          GNUNET_RECLAIM_Credential *credential,
-                                          struct GNUNET_TIME_Absolute*exp)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (GNUNET_OK !=  plugin->api->get_expiration (plugin->api->cls,
-                                                   credential,
-                                                   exp))
-      continue;
-    return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert an presentation type name to the corresponding number
- *
- * @param typename name to convert
- * @return corresponding number, UINT32_MAX on error
- */
-uint32_t
-GNUNET_RECLAIM_presentation_typename_to_number (const char *typename)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  uint32_t ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (UINT32_MAX !=
-        (ret = plugin->api->typename_to_number_p (plugin->api->cls,
-                                                  typename)))
-      return ret;
-  }
-  return UINT32_MAX;
-}
-
-
-const char *
-GNUNET_RECLAIM_presentation_number_to_typename (uint32_t type)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  const char *ret;
-
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->number_to_typename_p (plugin->api->cls, type)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-/**
- * Convert human-readable version of a 'claim' of an presentation 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_presentation_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 = credential_plugins[i];
-    if (GNUNET_OK == plugin->api->string_to_value_p (plugin->api->cls,
-                                                     type,
-                                                     s,
-                                                     data,
-                                                     data_size))
-      return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert the 'claim' of an presentation to a string
- *
- * @param type the type of presentation
- * @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_presentation_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 = credential_plugins[i];
-    if (NULL != (ret = plugin->api->value_to_string_p (plugin->api->cls,
-                                                       type,
-                                                       data,
-                                                       data_size)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-struct GNUNET_RECLAIM_Presentation *
-GNUNET_RECLAIM_presentation_new (uint32_t type,
-                                 const void *data,
-                                 size_t data_size)
-{
-  struct GNUNET_RECLAIM_Presentation *attr;
-  char *write_ptr;
-
-  attr = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_Presentation)
-                        + data_size);
-  attr->type = type;
-  attr->data_size = data_size;
-  write_ptr = (char *) &attr[1];
-  GNUNET_memcpy (write_ptr, data, data_size);
-  attr->data = write_ptr;
-  return attr;
-}
-
-
-/**
- * Get required size for serialization buffer
- *
- * @param attrs the attribute list to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_presentation_list_serialize_get_size (
-  const struct GNUNET_RECLAIM_PresentationList *presentations)
-{
-  struct GNUNET_RECLAIM_PresentationListEntry *le;
-  size_t len = 0;
-
-  for (le = presentations->list_head; NULL != le; le = le->next)
-  {
-    GNUNET_assert (NULL != le->presentation);
-    len += GNUNET_RECLAIM_presentation_serialize_get_size (le->presentation);
-  }
-  return len;
-}
-
-
-size_t
-GNUNET_RECLAIM_presentation_list_serialize (
-  const struct GNUNET_RECLAIM_PresentationList *presentations,
-  char *result)
-{
-  struct GNUNET_RECLAIM_PresentationListEntry *le;
-  size_t len;
-  size_t total_len;
-  char *write_ptr;
-  write_ptr = result;
-  total_len = 0;
-  for (le = presentations->list_head; NULL != le; le = le->next)
-  {
-    GNUNET_assert (NULL != le->presentation);
-    len = GNUNET_RECLAIM_presentation_serialize (le->presentation, write_ptr);
-    total_len += len;
-    write_ptr += len;
-  }
-  return total_len;
-}
-
-
-/**
- * Deserialize an presentation list
- *
- * @param data the serialized attribute list
- * @param data_size the length of the serialized data
- * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
- */
-struct GNUNET_RECLAIM_PresentationList *
-GNUNET_RECLAIM_presentation_list_deserialize (const char *data, size_t
-                                              data_size)
-{
-  struct GNUNET_RECLAIM_PresentationList *al;
-  struct GNUNET_RECLAIM_PresentationListEntry *ale;
-  size_t att_len;
-  const char *read_ptr;
-
-  al = GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
-
-  if (data_size < sizeof(struct Presentation))
-    return al;
-
-  read_ptr = data;
-  while (((data + data_size) - read_ptr) >= sizeof(struct Presentation))
-  {
-    ale = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-    ale->presentation =
-      GNUNET_RECLAIM_presentation_deserialize (read_ptr,
-                                               data_size - (read_ptr - data));
-    if (NULL == ale->presentation)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to deserialize malformed presentation.\n");
-      GNUNET_free (ale);
-      return al;
-    }
-    GNUNET_CONTAINER_DLL_insert (al->list_head, al->list_tail, ale);
-    att_len = GNUNET_RECLAIM_presentation_serialize_get_size (
-      ale->presentation);
-    read_ptr += att_len;
-  }
-  return al;
-}
-
-
-/**
- * Make a (deep) copy of the presentation list
- * @param attrs claim list to copy
- * @return copied claim list
- */
-struct GNUNET_RECLAIM_PresentationList *
-GNUNET_RECLAIM_presentation_list_dup (
-  const struct GNUNET_RECLAIM_PresentationList *al)
-{
-  struct GNUNET_RECLAIM_PresentationListEntry *ale;
-  struct GNUNET_RECLAIM_PresentationListEntry *result_ale;
-  struct GNUNET_RECLAIM_PresentationList *result;
-
-  result = GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
-  for (ale = al->list_head; NULL != ale; ale = ale->next)
-  {
-    result_ale = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-    GNUNET_assert (NULL != ale->presentation);
-    result_ale->presentation =
-      GNUNET_RECLAIM_presentation_new (ale->presentation->type,
-                                       ale->presentation->data,
-                                       ale->presentation->data_size);
-    result_ale->presentation->credential_id = ale->presentation->credential_id;
-    GNUNET_CONTAINER_DLL_insert (result->list_head,
-                                 result->list_tail,
-                                 result_ale);
-  }
-  return result;
-}
-
-
-void
-GNUNET_RECLAIM_presentation_list_destroy (
-  struct GNUNET_RECLAIM_PresentationList *presentations)
-{
-  struct GNUNET_RECLAIM_PresentationListEntry *ale;
-  struct GNUNET_RECLAIM_PresentationListEntry *tmp_ale;
-
-  for (ale = presentations->list_head; NULL != ale;)
-  {
-    if (NULL != ale->presentation)
-      GNUNET_free (ale->presentation);
-    tmp_ale = ale;
-    ale = ale->next;
-    GNUNET_free (tmp_ale);
-  }
-  GNUNET_free (presentations);
-}
-
-
-/**
- * Get required size for serialization buffer
- *
- * @param attr the presentation to serialize
- * @return the required buffer size
- */
-size_t
-GNUNET_RECLAIM_presentation_serialize_get_size (
-  const struct GNUNET_RECLAIM_Presentation *presentation)
-{
-  return sizeof(struct Presentation) + presentation->data_size;
-}
-
-
-size_t
-GNUNET_RECLAIM_presentation_serialize (
-  const struct GNUNET_RECLAIM_Presentation *presentation,
-  char *result)
-{
-  struct Presentation *atts;
-  char *write_ptr;
-
-  atts = (struct Presentation *) result;
-  atts->presentation_type = htonl (presentation->type);
-  atts->credential_id = presentation->credential_id;
-  write_ptr = (char *) &atts[1];
-  GNUNET_memcpy (write_ptr, presentation->data, presentation->data_size);
-  atts->data_size = htons (presentation->data_size);
-
-  return sizeof(struct Presentation) + presentation->data_size;
-}
-
-
-/**
- * Deserialize an presentation
- *
- * @param data the serialized presentation
- * @param data_size the length of the serialized data
- *
- * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
- */
-struct GNUNET_RECLAIM_Presentation *
-GNUNET_RECLAIM_presentation_deserialize (const char *data, size_t data_size)
-{
-  struct GNUNET_RECLAIM_Presentation *presentation;
-  struct Presentation *atts;
-  size_t data_len;
-  char *write_ptr;
-
-  if (data_size < sizeof(struct Presentation))
-    return NULL;
-
-  atts = (struct Presentation *) data;
-  data_len = ntohs (atts->data_size);
-  if (data_size < sizeof(struct Presentation) + data_len)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Buffer too small to deserialize\n");
-    return NULL;
-  }
-  presentation = GNUNET_malloc (sizeof(struct GNUNET_RECLAIM_Presentation)
-                                + data_len);
-  presentation->type = ntohl (atts->presentation_type);
-  presentation->credential_id = atts->credential_id;
-  presentation->data_size = data_len;
-
-  write_ptr = (char *) &presentation[1];
-  GNUNET_memcpy (write_ptr, &atts[1], data_len);
-  presentation->data = write_ptr;
-  return presentation;
-}
-
-
-struct GNUNET_RECLAIM_AttributeList*
-GNUNET_RECLAIM_presentation_get_attributes (const struct
-                                            GNUNET_RECLAIM_Presentation *
-                                            presentation)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  struct GNUNET_RECLAIM_AttributeList *ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->get_attributes_p (plugin->api->cls,
-                                              presentation)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-char*
-GNUNET_RECLAIM_presentation_get_issuer (const struct
-                                        GNUNET_RECLAIM_Presentation *
-                                        presentation)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  char *ret;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (NULL !=
-        (ret = plugin->api->get_issuer_p (plugin->api->cls,
-                                          presentation)))
-      return ret;
-  }
-  return NULL;
-}
-
-
-int
-GNUNET_RECLAIM_presentation_get_expiration (const struct
-                                            GNUNET_RECLAIM_Presentation *
-                                            presentation,
-                                            struct GNUNET_TIME_Absolute*exp)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (GNUNET_OK !=  plugin->api->get_expiration_p (plugin->api->cls,
-                                                     presentation,
-                                                     exp))
-      continue;
-    return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Create a presentation from a credential and a lift of (selected)
- * attributes in the credential.
- *
- * @param cred the credential to use
- * @param attrs the attributes to present from the credential
- * @return the credential presentation presenting the attributes according
- *         to the presentation mechanism of the credential
- *         or NULL on error.
- */
-int
-GNUNET_RECLAIM_credential_get_presentation (
-  const struct GNUNET_RECLAIM_Credential *cred,
-  const struct GNUNET_RECLAIM_AttributeList *attrs,
-  struct GNUNET_RECLAIM_Presentation **presentation)
-{
-  unsigned int i;
-  struct Plugin *plugin;
-  init ();
-  for (i = 0; i < num_plugins; i++)
-  {
-    plugin = credential_plugins[i];
-    if (GNUNET_OK !=  plugin->api->create_presentation (plugin->api->cls,
-                                                        cred,
-                                                        attrs,
-                                                        presentation))
-      continue;
-    (*presentation)->credential_id = cred->id;
-    return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
diff --git a/src/reclaim/reclaim_credential.h b/src/reclaim/reclaim_credential.h
deleted file mode 100644
index ffec15445..000000000
--- a/src/reclaim/reclaim_credential.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Martin Schanzenbach
- * @file reclaim/reclaim_credential.h
- * @brief GNUnet reclaim identity attribute credentials
- *
- */
-#ifndef RECLAIM_CREDENTIAL_H
-#define RECLAIM_CREDENTIAL_H
-
-#include "gnunet_reclaim_service.h"
-
-/**
- * Serialized credential claim
- */
-struct Credential
-{
-  /**
-   * Credential type
-   */
-  uint32_t credential_type;
-
-  /**
-   * Credential flag
-   */
-  uint32_t credential_flag;
-
-  /**
-   * Credential ID
-   */
-  struct GNUNET_RECLAIM_Identifier credential_id;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t nl_reserved;
-
-  /**
-   * Name length
-   */
-  uint16_t name_len;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t dl_reserved;
-
-  /**
-   * Data size
-   */
-  uint16_t data_size;
-
-  // followed by data_size Credential value data
-};
-
-
-/**
- * Serialized presentation claim
- */
-struct Presentation
-{
-  /**
-   * Presentation type
-   */
-  uint32_t presentation_type;
-
-  /**
-   * Presentation flag
-   */
-  uint32_t presentation_flag;
-
-  /**
-   * Credential ID
-   */
-  struct GNUNET_RECLAIM_Identifier credential_id;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved_nl GNUNET_PACKED;
-
-  /**
-   * Name length
-   */
-  uint16_t name_len GNUNET_PACKED;
-
-  /**
-   * Reserved (alignment)
-   */
-  uint16_t reserved_ds GNUNET_PACKED;
-
-  /**
-   * Data size
-   */
-  uint16_t data_size GNUNET_PACKED;
-
-  // followed by data_size Presentation value data
-};
-
-
-#endif
diff --git a/src/reclaim/test_did_helper.c b/src/reclaim/test_did_helper.c
deleted file mode 100644
index c11f47540..000000000
--- a/src/reclaim/test_did_helper.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file reclaim/test_did_helper.c
- * @brief Unit tests for the helper library for DID related functions
- * @author Tristan Schwieren
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_gnsrecord_lib.h"
-#include "did_helper.h"
-#include "jansson.h"
-
-static const char test_skey_bytes[32] = {
-  0x9b, 0x93, 0x7b, 0x81, 0x32, 0x2d, 0x81, 0x6c,
-  0xfa, 0xb9, 0xd5, 0xa3, 0xba, 0xac, 0xc9, 0xb2,
-  0xa5, 0xfe, 0xbe, 0x4b, 0x14, 0x9f, 0x12, 0x6b,
-  0x36, 0x30, 0xf9, 0x3a, 0x29, 0x52, 0x70, 0x17
-};
-
-// TODO: Create a did manual from private key / independet of implementation
-static const char *test_did =
-  "did:gns:000G0509BYD1MPAXVSTNV0KRD1JAT0YZMPJFQNM869B66S72PSF17K4Y8G";
-
-static const char *test_multibase_key =
-  "u7QEJX5oaWV3edV2CeGhkrQPfpaT71ogyVmNk4rZeE8yeRA";
-
-static const char *test_did_document_format_str =
-  "{\"@context\":[\"https://www.w3.org/ns/did/v1\",\
-  \"https://w3id.org/security/suites/ed25519-2020/v1\"],\
-  \"id\":\"%s\",\
-  \"verificationMethod\":[{\
-  \"id\":\"%s#key-1\",\
-  \"type\":\"Ed25519VerificationKey2020\",\
-  \"controller\":\"%s\",\
-  \"publicKeyMultibase\":\"%s\"}],\
-  \"authentication\":[\"#key-1\"],\
-  \"assertionMethod\":[\"#key-1\"]}";
-
-static struct GNUNET_CRYPTO_PrivateKey test_skey;
-static struct GNUNET_CRYPTO_PublicKey test_pkey;
-static struct json_t *test_did_document;
-static char *test_did_document_str;
-
-void
-test_GNUNET_DID_pkey_to_did ()
-{
-  char *str_did;
-  str_did = DID_pkey_to_did (&test_pkey);
-  GNUNET_assert (strcmp ((char *) test_did, str_did) == 0);
-  GNUNET_free (str_did);
-}
-
-void
-test_GNUNET_DID_did_to_pkey ()
-{
-  struct GNUNET_CRYPTO_PublicKey pkey;
-  DID_did_to_pkey ((char *) test_did, &pkey);
-
-  GNUNET_assert (test_pkey.type = pkey.type);
-  GNUNET_assert (memcmp (&pkey.eddsa_key,
-                         &test_pkey.eddsa_key,
-                         sizeof (test_pkey.eddsa_key)) == 0);
-}
-
-// void
-// test_GNUNET_DID_key_convert_multibase_base64_to_gnunet ();
-
-void
-test_GNUNET_DID_key_convert_gnunet_to_multibase_base64 ()
-{
-  char *multibase_key;
-  multibase_key = DID_key_convert_gnunet_to_multibase_base64 (&test_pkey);
-
-  GNUNET_assert (strcmp (test_multibase_key, multibase_key) == 0);
-  GNUNET_free (multibase_key);
-}
-
-void
-test_GNUNET_DID_pkey_to_did_document ()
-{
-  struct json_t *did_document;
-  char *did_document_str = DID_pkey_to_did_document (&test_pkey);
-  did_document = json_loads (did_document_str, JSON_DECODE_ANY, NULL);
-  GNUNET_assert (json_equal (test_did_document, did_document) == 1);
-  json_decref (did_document);
-  GNUNET_free (did_document_str);
-}
-
-int
-main ()
-{
-  // Setup key
-  test_skey.type = htonl (GNUNET_PUBLIC_KEY_TYPE_EDDSA);
-  memcpy (&(test_skey.eddsa_key),
-          test_skey_bytes,
-          sizeof(struct GNUNET_CRYPTO_EddsaPrivateKey));
-  GNUNET_CRYPTO_key_get_public (&test_skey, &test_pkey);
-
-  // Setup did document
-  GNUNET_asprintf (&test_did_document_str,
-                   test_did_document_format_str,
-                   test_did,
-                   test_did,
-                   test_did,
-                   test_multibase_key);
-  test_did_document = json_loads (test_did_document_str, JSON_DECODE_ANY, NULL);
-
-  // Do tests
-  test_GNUNET_DID_pkey_to_did ();
-  test_GNUNET_DID_did_to_pkey ();
-  test_GNUNET_DID_pkey_to_did_document ();
-  test_GNUNET_DID_key_convert_gnunet_to_multibase_base64 ();
-  json_decref (test_did_document);
-  return 0;
-}
diff --git a/src/reclaim/test_reclaim.conf b/src/reclaim/test_reclaim.conf
deleted file mode 100644
index faa195ae1..000000000
--- a/src/reclaim/test_reclaim.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-@INLINE@ test_reclaim_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-reclaim-peer-1/
-
-[dht]
-START_ON_DEMAND = YES
-
-[rest]
-START_ON_DEMAND = YES
-PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog
-
-[transport]
-PLUGINS =
-
-[zonemaster]
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-
-[reclaim]
-START_ON_DEMAND = YES
-TICKET_REFRESH_INTERVAL = 1 h
-#PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog
-
-[gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-START_ON_DEMAND = YES
-AUTO_IMPORT_PKEY = YES
-MAX_PARALLEL_BACKGROUND_QUERIES = 10
-DEFAULT_LOOKUP_TIMEOUT = 15 s
-RECORD_PUT_INTERVAL = 1 h
-ZONE_PUBLISH_TIME_WINDOW = 1 h
-DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
-
-[reclaim-rest-plugin]
-address = http://localhost:8000/#/login
-psw = mysupersecretpassword
-expiration_time = 3600
diff --git a/src/reclaim/test_reclaim.sh b/src/reclaim/test_reclaim.sh
deleted file mode 100755
index da93b10f7..000000000
--- a/src/reclaim/test_reclaim.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#trap "gnunet-arm -e -c test_reclaim_lookup.conf" SIGINT
-
-LOCATION=$(which gnunet-config)
-if [ -z $LOCATION ]
-then
-  LOCATION="gnunet-config"
-fi
-$LOCATION --version 1> /dev/null
-if test $? != 0
-then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-        exit 77
-fi
-
-rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
-
-#  (1) PKEY1.user -> PKEY2.resu.user
-#  (2) PKEY2.resu -> PKEY3
-#  (3) PKEY3.user -> PKEY4
-
-
-which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
-
-TEST_ATTR="test"
-gnunet-arm -s -c test_reclaim.conf
-gnunet-identity -C testego -c test_reclaim.conf
-valgrind gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
-gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
-gnunet-reclaim -e testego -D -c test_reclaim.conf
-gnunet-arm -e -c test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_attribute.c b/src/reclaim/test_reclaim_attribute.c
deleted file mode 100644
index acbcda62d..000000000
--- a/src/reclaim/test_reclaim_attribute.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_reclaim_lib.h"
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_RECLAIM_AttributeList *al;
-  struct GNUNET_RECLAIM_AttributeList *al_two;
-  struct GNUNET_RECLAIM_AttributeListEntry *ale;
-  char attrname[100];
-  char attrdata[100];
-  size_t ser_len_claimed;
-  size_t ser_len_actual;
-  char *ser_data;
-  int count = 0;
-
-  al = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  for (int i = 0; i < 12; i++)
-  {
-    memset (attrname, 0, 100);
-    memset (attrdata, 0, 100);
-    sprintf (attrname, "attr%d", i);
-    sprintf (attrdata, "%d", i);
-    ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
-    ale->attribute = GNUNET_RECLAIM_attribute_new (attrname,
-                                                   &GNUNET_RECLAIM_ID_ZERO,
-                                                   GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING,
-                                                   attrdata,
-                                                   strlen (attrdata));
-    GNUNET_CONTAINER_DLL_insert (al->list_head,
-                                 al->list_tail,
-                                 ale);
-  }
-  ser_len_claimed = GNUNET_RECLAIM_attribute_list_serialize_get_size (al);
-  ser_data = GNUNET_malloc (ser_len_claimed);
-  ser_len_actual = GNUNET_RECLAIM_attribute_list_serialize (al,
-                                                            ser_data);
-  GNUNET_assert (ser_len_claimed == ser_len_actual);
-  al_two = GNUNET_RECLAIM_attribute_list_deserialize (ser_data,
-                                                      ser_len_actual);
-  for (ale = al_two->list_head; NULL != ale; ale = ale->next)
-    count++;
-  GNUNET_assert (12 == count);
-  //GNUNET_assert (-1 != deser_len);
-  GNUNET_free (ser_data);
-  GNUNET_RECLAIM_attribute_list_destroy (al);
-  GNUNET_RECLAIM_attribute_list_destroy (al_two);
-}
diff --git a/src/reclaim/test_reclaim_attribute.sh b/src/reclaim/test_reclaim_attribute.sh
deleted file mode 100755
index 17f7863d4..000000000
--- a/src/reclaim/test_reclaim_attribute.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-trap "gnunet-arm -e -c test_reclaim.conf" SIGINT
-
-LOCATION=$(which gnunet-config)
-if [ -z $LOCATION ]
-then
-  LOCATION="gnunet-config"
-fi
-$LOCATION --version 1> /dev/null
-if test $? != 0
-then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-        exit 77
-fi
-
-rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
-
-#  (1) PKEY1.user -> PKEY2.resu.user
-#  (2) PKEY2.resu -> PKEY3
-#  (3) PKEY3.user -> PKEY4
-
-
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
-
-TEST_ATTR="test"
-gnunet-arm -s -c test_reclaim.conf
-#gnunet-arm -i rest -c test_reclaim.conf
-gnunet-identity -C testego -c test_reclaim.conf
-gnunet-identity -C rpego -c test_reclaim.conf
-TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
-gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
-gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
-if test $? != 0
-then
-  echo "Failed."
-  exit 1
-fi
-
-#curl localhost:7776/reclaim/attributes/testego
-gnunet-arm -e -c test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_consume.sh b/src/reclaim/test_reclaim_consume.sh
deleted file mode 100755
index 8a88136c6..000000000
--- a/src/reclaim/test_reclaim_consume.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-trap "gnunet-arm -e -c test_reclaim.conf" SIGINT
-
-LOCATION=$(which gnunet-config)
-if [ -z $LOCATION ]
-then
-  LOCATION="gnunet-config"
-fi
-$LOCATION --version 1>/dev/null
-if test $? != 0
-then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-        exit 77
-fi
-
-rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
-
-#  (1) PKEY1.user -> PKEY2.resu.user
-#  (2) PKEY2.resu -> PKEY3
-#  (3) PKEY3.user -> PKEY4
-
-
-which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30"
-
-TEST_ATTR="test"
-gnunet-arm -s -c test_reclaim.conf
-#gnunet-arm -i rest -c test_reclaim.conf
-gnunet-arm -I
-gnunet-identity -C testego -c test_reclaim.conf
-gnunet-identity -C rpego -c test_reclaim.conf
-SUBJECT_KEY=$(gnunet-identity -d -e rpego -q -c test_reclaim.conf)
-TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
-gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
-gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
-TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}')
-gnunet-namestore -z testego -D -c test_reclaim.conf
-gnunet-identity -d -c test_reclaim.conf
-sleep 1
-gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf
-
-RES=$?
-gnunet-identity -D testego -c test_reclaim.conf
-gnunet-identity -D rpego -c test_reclaim.conf
-gnunet-arm -e -c test_reclaim.conf
-if test $RES != 0
-then
-  echo "Failed."
-fi
-
diff --git a/src/reclaim/test_reclaim_defaults.conf b/src/reclaim/test_reclaim_defaults.conf
deleted file mode 100644
index a9a197dea..000000000
--- a/src/reclaim/test_reclaim_defaults.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-testing/
-
-[namestore-sqlite]
-FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
-
-[namecache-sqlite]
-FILENAME=$GNUNET_TEST_HOME/namecache/namecache.db
-
-[identity]
-# Directory where we store information about our egos
-EGODIR = $GNUNET_TEST_HOME/identity/egos/
-
-[dhtcache]
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-
-[transport-tcp]
-BINDTO = 127.0.0.1
-
diff --git a/src/reclaim/test_reclaim_issue.sh b/src/reclaim/test_reclaim_issue.sh
deleted file mode 100755
index 63140e54c..000000000
--- a/src/reclaim/test_reclaim_issue.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-trap "gnunet-arm -e -c test_reclaim.conf" SIGINT
-
-LOCATION=$(which gnunet-config)
-if [ -z $LOCATION ]
-then
-  LOCATION="gnunet-config"
-fi
-$LOCATION --version 1> /dev/null
-if test $? != 0
-then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-        exit 77
-fi
-
-rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
-
-#  (1) PKEY1.user -> PKEY2.resu.user
-#  (2) PKEY2.resu -> PKEY3
-#  (3) PKEY3.user -> PKEY4
-
-
-which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30"
-
-TEST_ATTR="test"
-gnunet-arm -s -c test_reclaim.conf
-#gnunet-arm -i rest -c test_reclaim.conf
-gnunet-identity -C testego -c test_reclaim.conf
-gnunet-identity -C rpego -c test_reclaim.conf
-SUBJECT_KEY=$(gnunet-identity -d -e rpego -q -c test_reclaim.conf)
-TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
-gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
-gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
-#gnunet-reclaim -e testego -D -c test_reclaim.conf
-gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf > /dev/null 2>&1
-if test $? != 0
-then
-  echo "Failed."
-  exit 1
-fi
-#curl http://localhost:7776/reclaim/attributes/testego
-gnunet-arm -e -c test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_revoke.sh b/src/reclaim/test_reclaim_revoke.sh
deleted file mode 100755
index da091a1ee..000000000
--- a/src/reclaim/test_reclaim_revoke.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-trap "gnunet-arm -e -c test_reclaim.conf" SIGINT
-
-LOCATION=$(which gnunet-config)
-if [ -z $LOCATION ]
-then
-  LOCATION="gnunet-config"
-fi
-$LOCATION --version 1> /dev/null
-if test $? != 0
-then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-        exit 77
-fi
-
-rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
-
-#  (1) PKEY1.user -> PKEY2.resu.user
-#  (2) PKEY2.resu -> PKEY3
-#  (3) PKEY3.user -> PKEY4
-
-
-which timeout >/dev/null 2&>1 && DO_TIMEOUT="timeout 30"
-
-TEST_ATTR="test"
-gnunet-arm -s -c test_reclaim.conf >/dev/null 2&>1
-gnunet-identity -C alice -c test_reclaim.conf
-gnunet-identity -C bob -c test_reclaim.conf
-gnunet-identity -C eve -c test_reclaim.conf
-ALICE_KEY=$(gnunet-identity -d -e alice -q -c test_reclaim.conf)
-BOB_KEY=$(gnunet-identity -d -e bob -q -c test_reclaim.conf)
-EVE_KEY=$(gnunet-identity -d -e eve -q -c test_reclaim.conf)
-gnunet-reclaim -e alice -E 15s -a email -V john@doe.gnu -c test_reclaim.conf
-gnunet-reclaim -e alice -E 15s -a name -V John -c test_reclaim.conf
-TICKET_BOB=$(gnunet-reclaim -e alice -i "email,name" -r $BOB_KEY -c test_reclaim.conf | awk '{print $1}')
-#gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf
-TICKET_EVE=$(gnunet-reclaim -e alice -i "email" -r $EVE_KEY -c test_reclaim.conf | awk '{print $1}')
-gnunet-namestore -z alice -D
-echo "Revoking $TICKET"
-gnunet-reclaim -e alice -R $TICKET_EVE -c test_reclaim.conf
-gnunet-namestore -z alice -D
-sleep 16
-echo "Consuming $TICKET"
-
-gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf
-if test $? = 0
-then
-  echo "Eve can still resolve attributes..."
-  gnunet-arm -e -c test_reclaim.conf
-  exit 1
-fi
-
-gnunet-arm -e -c test_reclaim.conf
-gnunet-arm -s -c test_reclaim.conf >/dev/null 2&>1
-
-gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf
-#gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf >/dev/null 2&>1
-if test $? != 0
-then
-  echo "Bob cannot resolve attributes..."
-  gnunet-arm -e -c test_reclaim.conf
-  exit 1
-fi
-
-gnunet-arm -e -c test_reclaim.conf
diff --git a/src/reclaim/test_w3c_ed25519_2020.c b/src/reclaim/test_w3c_ed25519_2020.c
deleted file mode 100644
index e2534e6ab..000000000
--- a/src/reclaim/test_w3c_ed25519_2020.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-
-/**
- * @file src/did/test_w3c_ed25519_2020.c
- * @brief Testcases for the w3c Ed25519 formats for SSIs https://w3c-ccg.github.io/lds-ed25519-2020
- * @author Martin Schanzenbach
- */
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
-
-static char test_privkey[32] = {
-  0x9b, 0x93, 0x7b, 0x81, 0x32, 0x2d, 0x81, 0x6c,
-  0xfa, 0xb9, 0xd5, 0xa3, 0xba, 0xac, 0xc9, 0xb2,
-  0xa5, 0xfe, 0xbe, 0x4b, 0x14, 0x9f, 0x12, 0x6b,
-  0x36, 0x30, 0xf9, 0x3a, 0x29, 0x52, 0x70, 0x17
-};
-
-static char *targetPublicKeyMultibase = "u7QEJX5oaWV3edV2CeGhkrQPfpaT71ogyVmNk4rZeE8yeRA";
-
-int
-main ()
-{
-  struct GNUNET_CRYPTO_EddsaPrivateKey privkey;
-  struct GNUNET_CRYPTO_EddsaPublicKey pubkey;
-
-  memcpy (&privkey, test_privkey, sizeof (privkey));
-  GNUNET_CRYPTO_eddsa_key_get_public (&privkey, &pubkey);
-
-  //This is how to convert out pubkeys to W3c Ed25519-2020 multibase (base64url no padding)
-  char *b64;
-  char pkx[34];
-  pkx[0] = 0xed;
-  pkx[1] = 0x01;
-  memcpy (pkx+2, &pubkey, sizeof (pubkey));
-  GNUNET_STRINGS_base64url_encode (pkx,
-                                   sizeof (pkx),
-                                   &b64);
-  printf ("u%s\n%s\n", b64, targetPublicKeyMultibase);
-  // FIXME convert pubkey to target
-  char *res;
-  GNUNET_asprintf (&res, "u%s", b64);
-  GNUNET_assert (0 == strcmp (res,
-                              targetPublicKeyMultibase));
-
-  GNUNET_free (b64);
-  GNUNET_free (res);
-  return 0;
-}