54 files changed, 320 insertions, 258 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b30ae47f6..081b83190 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,5 +10,4 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  reclaim \
   messenger
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 950aab622..9b30c22ae 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -14,4 +14,5 @@ SUBDIRS = \
         vpn \
         gns \
         fs \
-        cadet
+        cadet \
+        reclaim
diff --git a/src/cli/reclaim/.gitignore b/src/cli/reclaim/.gitignore
new file mode 100644
index 000000000..49e84eb66
--- /dev/null
+++ b/src/cli/reclaim/.gitignore
@@ -0,0 +1,2 @@
+gnunet-reclaim
+gnunet-did
diff --git a/src/cli/reclaim/Makefile.am b/src/cli/reclaim/Makefile.am
new file mode 100644
index 000000000..1a9273f6b
--- /dev/null
+++ b/src/cli/reclaim/Makefile.am
@@ -0,0 +1,55 @@
+# 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
+
+
+EXTRA_DIST = \
+  $(check_SCRIPTS)
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-reclaim \
+ gnunet-did
+
+gnunet_reclaim_SOURCES = \
+ gnunet-reclaim.c
+gnunet_reclaim_LDADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.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 \
+  $(top_builddir)/src/service/reclaim/libgnunetdid.la \
+        -ljansson
+gnunet_did_CFLAGS = \
+        -I$(top_builddir)/src/service/reclaim
+
+check_SCRIPTS = \
+  test_reclaim_attribute.sh \
+  test_reclaim_issue.sh \
+  test_reclaim_consume.sh
+
+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/gnunet-did.c b/src/cli/reclaim/gnunet-did.c
index e88a3671e..33f6c5657 100644
--- a/src/reclaim/gnunet-did.c
+++ b/src/cli/reclaim/gnunet-did.c
@@ -39,7 +39,6 @@
 #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"
 
diff --git a/src/reclaim/gnunet-reclaim.c b/src/cli/reclaim/gnunet-reclaim.c
index efb2c2902..efb2c2902 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/cli/reclaim/gnunet-reclaim.c
diff --git a/src/reclaim/test_reclaim.sh b/src/cli/reclaim/test_reclaim.sh
index da93b10f7..da93b10f7 100755
--- a/src/reclaim/test_reclaim.sh
+++ b/src/cli/reclaim/test_reclaim.sh
diff --git a/src/reclaim/test_reclaim_attribute.sh b/src/cli/reclaim/test_reclaim_attribute.sh
index 17f7863d4..17f7863d4 100755
--- a/src/reclaim/test_reclaim_attribute.sh
+++ b/src/cli/reclaim/test_reclaim_attribute.sh
diff --git a/src/reclaim/test_reclaim_consume.sh b/src/cli/reclaim/test_reclaim_consume.sh
index 8a88136c6..8a88136c6 100755
--- a/src/reclaim/test_reclaim_consume.sh
+++ b/src/cli/reclaim/test_reclaim_consume.sh
diff --git a/src/reclaim/test_reclaim_issue.sh b/src/cli/reclaim/test_reclaim_issue.sh
index 63140e54c..63140e54c 100755
--- a/src/reclaim/test_reclaim_issue.sh
+++ b/src/cli/reclaim/test_reclaim_issue.sh
diff --git a/src/reclaim/test_reclaim_revoke.sh b/src/cli/reclaim/test_reclaim_revoke.sh
index da091a1ee..da091a1ee 100755
--- a/src/reclaim/test_reclaim_revoke.sh
+++ b/src/cli/reclaim/test_reclaim_revoke.sh
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 574c57639..1a1ecffa7 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -6,4 +6,5 @@ SUBDIRS = \
         namestore \
         revocation \
         gns \
-        fs
+        fs \
+        reclaim
diff --git a/src/plugin/reclaim/Makefile.am b/src/plugin/reclaim/Makefile.am
new file mode 100644
index 000000000..0b5159c6b
--- /dev/null
+++ b/src/plugin/reclaim/Makefile.am
@@ -0,0 +1,70 @@
+# 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
+
+
+CREDENTIAL_PLUGIN = \
+  libgnunet_plugin_reclaim_credential_jwt.la
+
+if HAVE_PABC
+  CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
+endif
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_gnsrecord_reclaim.la \
+  libgnunet_plugin_reclaim_attribute_basic.la \
+  $(CREDENTIAL_PLUGIN)
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+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)
+
+
+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 \
+  $(top_builddir)/src/service/reclaim/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 \
+  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+  -ljansson\
+  $(LTLIBINTL)
+libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/plugin/reclaim/plugin_gnsrecord_reclaim.c
index ce6fe483d..ce6fe483d 100644
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ b/src/plugin/reclaim/plugin_gnsrecord_reclaim.c
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c b/src/plugin/reclaim/plugin_reclaim_attribute_basic.c
index 66f59998a..66f59998a 100644
--- a/src/reclaim/plugin_reclaim_attribute_basic.c
+++ b/src/plugin/reclaim/plugin_reclaim_attribute_basic.c
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/plugin/reclaim/plugin_reclaim_credential_jwt.c
index 3eb4bfebf..3eb4bfebf 100644
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ b/src/plugin/reclaim/plugin_reclaim_credential_jwt.c
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c b/src/plugin/reclaim/plugin_reclaim_credential_pabc.c
index a906805fb..a906805fb 100644
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ b/src/plugin/reclaim/plugin_reclaim_credential_pabc.c
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/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
index 4b1b71bb7..d76972b78 100644
--- a/src/rest-plugin/Makefile.am
+++ b/src/rest-plugin/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
         rest \
         identity \
-        gns
+        gns \
+        reclaim
diff --git a/src/rest-plugin/reclaim/Makefile.am b/src/rest-plugin/reclaim/Makefile.am
new file mode 100644
index 000000000..76ca198ab
--- /dev/null
+++ b/src/rest-plugin/reclaim/Makefile.am
@@ -0,0 +1,81 @@
+# 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
+
+if HAVE_PABC
+  REST_PLUGIN += libgnunet_plugin_rest_pabc.la
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+  $(REST_PLUGIN)
+
+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 \
+  $(top_builddir)/src/service/reclaim/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 \
+  $(top_builddir)/src/service/reclaim/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 = \
+  $(top_builddir)/src/service/reclaim/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
diff --git a/src/reclaim/json_reclaim.c b/src/rest-plugin/reclaim/json_reclaim.c
index b1ca7a4a5..b1ca7a4a5 100644
--- a/src/reclaim/json_reclaim.c
+++ b/src/rest-plugin/reclaim/json_reclaim.c
diff --git a/src/reclaim/json_reclaim.h b/src/rest-plugin/reclaim/json_reclaim.h
index 613ddf873..613ddf873 100644
--- a/src/reclaim/json_reclaim.h
+++ b/src/rest-plugin/reclaim/json_reclaim.h
diff --git a/src/reclaim/oidc_helper.c b/src/rest-plugin/reclaim/oidc_helper.c
index a2da7312b..a2da7312b 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/rest-plugin/reclaim/oidc_helper.c
diff --git a/src/reclaim/oidc_helper.h b/src/rest-plugin/reclaim/oidc_helper.h
index de788fbdb..de788fbdb 100644
--- a/src/reclaim/oidc_helper.h
+++ b/src/rest-plugin/reclaim/oidc_helper.h
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/rest-plugin/reclaim/plugin_rest_openid_connect.c
index d0aee043e..d0aee043e 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/rest-plugin/reclaim/plugin_rest_openid_connect.c
diff --git a/src/reclaim/plugin_rest_pabc.c b/src/rest-plugin/reclaim/plugin_rest_pabc.c
index 4b7d21df3..4b7d21df3 100644
--- a/src/reclaim/plugin_rest_pabc.c
+++ b/src/rest-plugin/reclaim/plugin_rest_pabc.c
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/rest-plugin/reclaim/plugin_rest_reclaim.c
index b2586109a..b2586109a 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/rest-plugin/reclaim/plugin_rest_reclaim.c
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 9b39208de..2eee658f8 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -29,5 +29,6 @@ SUBDIRS = \
   zonemaster \
         fs \
         exit \
-        pt
+        pt \
+        reclaim
 
diff --git a/src/reclaim/.gitignore b/src/service/reclaim/.gitignore
index e22aa5011..e22aa5011 100644
--- a/src/reclaim/.gitignore
+++ b/src/service/reclaim/.gitignore
diff --git a/src/service/reclaim/Makefile.am b/src/service/reclaim/Makefile.am
new file mode 100644
index 000000000..56b9e96e1
--- /dev/null
+++ b/src/service/reclaim/Makefile.am
@@ -0,0 +1,104 @@
+# 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
+
+
+EXTRA_DIST = \
+  reclaim.conf \
+  test_reclaim_defaults.conf \
+  test_reclaim.conf
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  reclaim.conf
+
+lib_LTLIBRARIES = \
+  libgnunetreclaim.la \
+  libgnunetdid.la
+
+libexec_PROGRAMS = \
+ gnunet-service-reclaim
+
+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
+
+test_reclaim_attribute_SOURCES = \
+  test_reclaim_attribute.c
+test_reclaim_attribute_LDADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  libgnunetreclaim.la \
+  $(GN_LIBINTL)
+
+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_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/service/reclaim/did.h
index ab1b65925..ab1b65925 100644
--- a/src/reclaim/did.h
+++ b/src/service/reclaim/did.h
diff --git a/src/reclaim/did_core.c b/src/service/reclaim/did_core.c
index ce3336b91..ce3336b91 100644
--- a/src/reclaim/did_core.c
+++ b/src/service/reclaim/did_core.c
diff --git a/src/reclaim/did_core.h b/src/service/reclaim/did_core.h
index 842424e14..842424e14 100644
--- a/src/reclaim/did_core.h
+++ b/src/service/reclaim/did_core.h
diff --git a/src/reclaim/did_helper.c b/src/service/reclaim/did_helper.c
index 3aac027ee..3aac027ee 100644
--- a/src/reclaim/did_helper.c
+++ b/src/service/reclaim/did_helper.c
diff --git a/src/reclaim/did_helper.h b/src/service/reclaim/did_helper.h
index d61992c68..d61992c68 100644
--- a/src/reclaim/did_helper.h
+++ b/src/service/reclaim/did_helper.h
diff --git a/src/reclaim/did_misc.c b/src/service/reclaim/did_misc.c
index 32b127b2b..32b127b2b 100644
--- a/src/reclaim/did_misc.c
+++ b/src/service/reclaim/did_misc.c
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/service/reclaim/gnunet-service-reclaim.c
index 47a86a3e8..47a86a3e8 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/service/reclaim/gnunet-service-reclaim.c
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/service/reclaim/gnunet-service-reclaim_tickets.c
index 689fbc429..689fbc429 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/service/reclaim/gnunet-service-reclaim_tickets.c
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.h b/src/service/reclaim/gnunet-service-reclaim_tickets.h
index 0ec232f49..0ec232f49 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.h
+++ b/src/service/reclaim/gnunet-service-reclaim_tickets.h
diff --git a/src/reclaim/meson.build b/src/service/reclaim/meson.build
index fafc68a92..fafc68a92 100644
--- a/src/reclaim/meson.build
+++ b/src/service/reclaim/meson.build
diff --git a/src/reclaim/pabc_helper.c b/src/service/reclaim/pabc_helper.c
index 65a633f7b..65a633f7b 100644
--- a/src/reclaim/pabc_helper.c
+++ b/src/service/reclaim/pabc_helper.c
diff --git a/src/reclaim/pabc_helper.h b/src/service/reclaim/pabc_helper.h
index 045ad5dda..045ad5dda 100644
--- a/src/reclaim/pabc_helper.h
+++ b/src/service/reclaim/pabc_helper.h
diff --git a/src/reclaim/reclaim.conf b/src/service/reclaim/reclaim.conf
index 07facc232..07facc232 100644
--- a/src/reclaim/reclaim.conf
+++ b/src/service/reclaim/reclaim.conf
diff --git a/src/reclaim/reclaim.h b/src/service/reclaim/reclaim.h
index 9d5118269..9d5118269 100644
--- a/src/reclaim/reclaim.h
+++ b/src/service/reclaim/reclaim.h
diff --git a/src/reclaim/reclaim_api.c b/src/service/reclaim/reclaim_api.c
index e9a34dd95..e9a34dd95 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/service/reclaim/reclaim_api.c
diff --git a/src/reclaim/reclaim_attribute.c b/src/service/reclaim/reclaim_attribute.c
index b235ed945..b235ed945 100644
--- a/src/reclaim/reclaim_attribute.c
+++ b/src/service/reclaim/reclaim_attribute.c
diff --git a/src/reclaim/reclaim_attribute.h b/src/service/reclaim/reclaim_attribute.h
index 44d85e61c..44d85e61c 100644
--- a/src/reclaim/reclaim_attribute.h
+++ b/src/service/reclaim/reclaim_attribute.h
diff --git a/src/reclaim/reclaim_credential.c b/src/service/reclaim/reclaim_credential.c
index 1aad261a1..1aad261a1 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/service/reclaim/reclaim_credential.c
diff --git a/src/reclaim/reclaim_credential.h b/src/service/reclaim/reclaim_credential.h
index ffec15445..ffec15445 100644
--- a/src/reclaim/reclaim_credential.h
+++ b/src/service/reclaim/reclaim_credential.h
diff --git a/src/reclaim/test_did_helper.c b/src/service/reclaim/test_did_helper.c
index c11f47540..c11f47540 100644
--- a/src/reclaim/test_did_helper.c
+++ b/src/service/reclaim/test_did_helper.c
diff --git a/src/reclaim/test_reclaim.conf b/src/service/reclaim/test_reclaim.conf
index faa195ae1..faa195ae1 100644
--- a/src/reclaim/test_reclaim.conf
+++ b/src/service/reclaim/test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_attribute.c b/src/service/reclaim/test_reclaim_attribute.c
index acbcda62d..acbcda62d 100644
--- a/src/reclaim/test_reclaim_attribute.c
+++ b/src/service/reclaim/test_reclaim_attribute.c
diff --git a/src/reclaim/test_reclaim_defaults.conf b/src/service/reclaim/test_reclaim_defaults.conf
index a9a197dea..a9a197dea 100644
--- a/src/reclaim/test_reclaim_defaults.conf
+++ b/src/service/reclaim/test_reclaim_defaults.conf
diff --git a/src/reclaim/test_w3c_ed25519_2020.c b/src/service/reclaim/test_w3c_ed25519_2020.c
index e2534e6ab..e2534e6ab 100644
--- a/src/reclaim/test_w3c_ed25519_2020.c
+++ b/src/service/reclaim/test_w3c_ed25519_2020.c