14 files changed, 31 insertions, 926 deletions
diff --git a/src/service/fs/test_plugin_block_fs.c b/src/service/fs/test_plugin_block_fs.c
deleted file mode 100644
index f15d10b17..000000000
--- a/src/service/fs/test_plugin_block_fs.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010, 2012 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 fs/test_plugin_block_fs.c
- * @brief test for plugin_block_fs.c
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_block_lib.h"
-static int
-test_fs (struct GNUNET_BLOCK_Context *ctx)
-{
-  struct GNUNET_HashCode key;
-  char block[4];
-  memset (block, 1, sizeof(block));
-  if (GNUNET_OK !=
-      GNUNET_BLOCK_get_key (ctx,
-                            GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                            block,
-                            sizeof(block),
-                            &key))
-    return 1;
-  if (GNUNET_OK !=
-      GNUNET_BLOCK_check_block (ctx,
-                                GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                                block,
-                                sizeof(block)))
-    return 2;
-  if (GNUNET_OK !=
-      GNUNET_BLOCK_check_query (ctx,
-                                GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                                &key,
-                                NULL, 0))
-    return 4;
-  GNUNET_log_skip (1, GNUNET_NO);
-  if (GNUNET_NO !=
-      GNUNET_BLOCK_check_query (ctx,
-                                GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                                &key,
-                                "bogus", 5))
-    return 8;
-  GNUNET_log_skip (0, GNUNET_YES);
-  return 0;
-}
-int
-main (int argc, char *argv[])
-{
-  int ret;
-  struct GNUNET_BLOCK_Context *ctx;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  GNUNET_log_setup ("test-block", "WARNING", NULL);
-  cfg = GNUNET_CONFIGURATION_create ();
-  ctx = GNUNET_BLOCK_context_create (cfg);
-  ret = test_fs (ctx);
-  GNUNET_BLOCK_context_destroy (ctx);
-  GNUNET_CONFIGURATION_destroy (cfg);
-  if (ret != 0)
-    fprintf (stderr, "Tests failed: %d\n", ret);
-  return ret;
-}
-/* end of test_plugin_block_fs.c */
diff --git a/src/service/gns/openssl.cnf b/src/service/gns/openssl.cnf
deleted file mode 100644
index a2561b9b2..000000000
--- a/src/service/gns/openssl.cnf
+++ /dev/null
@@ -1,244 +0,0 @@
-#
-# OpenSSL example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-# This definition stops the following lines choking if HOME isn't
-# defined.
-HOME                    = .
-RANDFILE                = $ENV::HOME/.rnd
-# Extra OBJECT IDENTIFIER info:
-#oid_file               = $ENV::HOME/.oid
-oid_section             = new_oids
-# To use this configuration file with the "-extfile" option of the
-# "openssl x509" utility, name here the section containing the
-# X.509v3 extensions to use:
-# extensions            =
-# (Alternatively, use a configuration file that has only
-# X.509v3 extensions in its main [= default] section.)
-[ new_oids ]
-# We can add new OIDs in here for use by 'ca' and 'req'.
-# Add a simple OID like this:
-# testoid1=1.2.3.4
-# Or use config file substitution like this:
-# testoid2=${testoid1}.5.6
-####################################################################
-[ ca ]
-default_ca      = CA_default            # The default ca section
-####################################################################
-[ CA_default ]
-dir             = ./demoCA              # Where everything is kept
-certs           = $dir/certs            # Where the issued certs are kept
-crl_dir         = $dir/crl              # Where the issued crl are kept
-database        = $dir/index.txt        # database index file.
-new_certs_dir   = $dir/newcerts         # default place for new certs.
-certificate     = $dir/cacert.pem       # The CA certificate
-serial          = $dir/serial           # The current serial number
-crl             = $dir/crl.pem          # The current CRL
-private_key     = $dir/private/cakey.pem# The private key
-RANDFILE        = $dir/private/.rand    # private random number file
-x509_extensions = usr_cert              # The extensions to add to the cert
-# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
-# so this is commented out by default to leave a V1 CRL.
-# crl_extensions        = crl_ext
-default_days    = 365                   # how long to certify for
-default_crl_days= 30                    # how long before next CRL
-default_md      = md5                   # which md to use.
-preserve        = no                    # keep passed DN ordering
-# A few difference way of specifying how similar the request should look
-# For type CA, the listed attributes must be the same, and the optional
-# and supplied fields are just that :-)
-policy          = policy_match
-# For the CA policy
-[ policy_match ]
-countryName             = match
-stateOrProvinceName     = match
-organizationName        = match
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-# For the 'anything' policy
-# At this point in time, you must list all acceptable 'object'
-# types.
-[ policy_anything ]
-countryName             = optional
-stateOrProvinceName     = optional
-localityName            = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-####################################################################
-[ req ]
-default_bits            = 1024
-default_keyfile         = privkey.pem
-distinguished_name      = req_distinguished_name
-attributes              = req_attributes
-x509_extensions = v3_ca # The extensions to add to the self signed cert
-# Passwords for private keys if not present they will be prompted for
-# input_password = secret
-# output_password = secret
-# This sets a mask for permitted string types. There are several options.
-# default: PrintableString, T61String, BMPString.
-# pkix   : PrintableString, BMPString.
-# utf8only: only UTF8Strings.
-# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
-# MASK:XXXX a literal mask value.
-# WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
-# so use this option with caution!
-string_mask = nombstr
-# req_extensions = v3_req # The extensions to add to a certificate request
-[ req_distinguished_name ]
-countryName                     = Country Name (2 letter code)
-countryName_default             = AU
-countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = State or Province Name (full name)
-stateOrProvinceName_default     = Some-State
-localityName                    = Locality Name (eg, city)
-0.organizationName              = Organization Name (eg, company)
-0.organizationName_default      = Internet Widgits Pty Ltd
-# we can do this but it is not needed normally :-)
-#1.organizationName             = Second Organization Name (eg, company)
-#1.organizationName_default     = World Wide Web Pty Ltd
-organizationalUnitName          = Organizational Unit Name (eg, section)
-#organizationalUnitName_default =
-commonName                      = Common Name (eg, YOUR name)
-commonName_max                  = 64
-emailAddress                    = Email Address
-emailAddress_max                = 40
-# SET-ex3                       = SET extension number 3
-[ req_attributes ]
-challengePassword               = A challenge password
-challengePassword_min           = 4
-challengePassword_max           = 20
-unstructuredName                = An optional company name
-[ usr_cert ]
-# These extensions are added when 'ca' signs a request.
-# This goes against PKIX guidelines but some CAs do it and some software
-# requires this to avoid interpreting an end user certificate as a CA.
-basicConstraints=CA:FALSE
-# Here are some examples of the usage of nsCertType. If it is omitted
-# the certificate can be used for anything *except* object signing.
-# This is OK for an SSL server.
-# nsCertType                    = server
-# For an object signing certificate this would be used.
-# nsCertType = objsign
-# For normal client use this is typical
-# nsCertType = client, email
-# and for everything including object signing:
-# nsCertType = client, email, objsign
-# This is typical in keyUsage for a client certificate.
-# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-# This will be displayed in Netscape's comment listbox.
-nsComment                       = "OpenSSL Generated Certificate"
-# PKIX recommendations harmless if included in all certificates.
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer:always
-# This stuff is for subjectAltName and issuerAltname.
-# Import the email address.
-# subjectAltName=email:copy
-# Copy subject details
-# issuerAltName=issuer:copy
-#nsCaRevocationUrl              = http://www.domain.dom/ca-crl.pem
-#nsBaseUrl
-#nsRevocationUrl
-#nsRenewalUrl
-#nsCaPolicyUrl
-#nsSslServerName
-[ v3_req ]
-# Extensions to add to a certificate request
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-[ v3_ca ]
-# Extensions for a typical CA
-# PKIX recommendation.
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer:always
-# This is what PKIX recommends but some broken software chokes on critical
-# extensions.
-#basicConstraints = critical,CA:true
-# So we do this instead.
-basicConstraints = CA:true
-# Key usage: this is typical for a CA certificate. However since it will
-# prevent it being used as an test self-signed certificate it is best
-# left out by default.
-# keyUsage = cRLSign, keyCertSign
-# Some might want this also
-# nsCertType = sslCA, emailCA
-# Include email address in subject alt name: another PKIX recommendation
-# subjectAltName=email:copy
-# Copy issuer details
-# issuerAltName=issuer:copy
-# DER hex encoding of an extension: beware experts only!
-# obj=DER:02:03
-# Where 'obj' is a standard or added object
-# You can even override a supported extension:
-# basicConstraints= critical, DER:30:03:01:01:FF
-[ crl_ext ]
-# CRL extensions.
-# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
-# issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always,issuer:always
diff --git a/src/service/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf
new file mode 100644
index 000000000..3dfeacafe
--- /dev/null
+++ b/src/service/gns/test_gns_proxy.conf
@@ -0,0 +1,31 @@
+@INLINE@ test_gns_defaults.conf
+[transport]
+PLUGINS = tcp
+[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
+[zonemaster-monitor]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+[zonemaster]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+[gns-proxy]
+PROXY_CACERT = $GNUNET_TMP/proxy_cacert.pem
+PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
+[namestore]
+START_ON_DEMAND = YES
diff --git a/src/service/gns/test_gnunet_gns.sh.in b/src/service/gns/test_gnunet_gns.sh.in
deleted file mode 100755
index d0c07b4e4..000000000
--- a/src/service/gns/test_gnunet_gns.sh.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# This file is in the public domain.
-# test -z being correct was a false assumption here.
-# I have no executable 'fooble', but this will
-# return 1:
-# if test -z "`which fooble`"; then echo 1; fi
-# The command builtin might not work with busybox's ash
-# but this works for now.
-dir=$(dirname "$0")
-existence() {
-  command -v "$1" >/dev/null 2>&1
-}
-LOCATION=`existence gnunet-config`
-if test -z $LOCATION; then
-    LOCATION="gnunet-config"
-fi
-$LOCATION --version
-if test $? != 0
-then
-    echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-    exit 77
-fi
-trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-ME=`whoami`
-if [ "$ME" != "root" ]
-then
-  echo "This test only works if run as root.  Skipping."
-  exit 77
-fi
-export PATH=".:$PATH"
-gnunet-service-gns -c gns.conf &
-sleep 1
-LO=`nslookup alice.gnu | grep Address | tail -n1`
-if [ "$LO" != "Address: 1.2.3.4" ]
-then
- echo "Fail: $LO"
-fi
-LO=`nslookup www.bob.gnu | grep Address | tail -n1`
-if [ "$LO" != "Address: 4.5.6.7" ]
-then
-  echo "Fail: $LO"
-fi
-# XXX: jobs. a builtin by bash, netbsd sh, maybe leave it be for now.
-kill `jobs -p`
diff --git a/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey b/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
deleted file mode 100644
index 895946037..000000000
--- a/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
+++ /dev/null
Binary files differ
diff --git a/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey b/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
deleted file mode 100644
index 3ef49f0ac..000000000
--- a/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
+++ /dev/null
Binary files differ
diff --git a/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey b/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
deleted file mode 100644
index 89e0b3a0a..000000000
--- a/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
+++ /dev/null
Binary files differ
diff --git a/src/service/gns/zonefiles/test_zonekey b/src/service/gns/zonefiles/test_zonekey
deleted file mode 100644
index 870c56315..000000000
--- a/src/service/gns/zonefiles/test_zonekey
+++ /dev/null
Binary files differ
diff --git a/src/service/namecache/test_plugin_namecache.c b/src/service/namecache/test_plugin_namecache.c
deleted file mode 100644
index 141698a23..000000000
--- a/src/service/namecache/test_plugin_namecache.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2012 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 namecache/test_plugin_namecache.c
- * @brief Test for the namecache plugins
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_namecache_plugin.h"
-#include "gnunet_testing_lib.h"
-static int ok;
-/**
- * Name of plugin under test.
- */
-static const char *plugin_name;
-/**
- * Function called when the service shuts down.  Unloads our namecache
- * plugin.
- *
- * @param api api to unload
- */
-static void
-unload_plugin (struct GNUNET_NAMECACHE_PluginFunctions *api)
-{
-  char *libname;
-  GNUNET_asprintf (&libname, "libgnunet_plugin_namecache_%s", plugin_name);
-  GNUNET_break (NULL == GNUNET_PLUGIN_unload (libname, api));
-  GNUNET_free (libname);
-}
-/**
- * Load the namecache plugin.
- *
- * @param cfg configuration to pass
- * @return NULL on error
- */
-static struct GNUNET_NAMECACHE_PluginFunctions *
-load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_NAMECACHE_PluginFunctions *ret;
-  char *libname;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Loading `%s' namecache plugin\n"),
-              plugin_name);
-  GNUNET_asprintf (&libname, "libgnunet_plugin_namecache_%s", plugin_name);
-  if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void *) cfg)))
-  {
-    fprintf (stderr, "Failed to load plugin `%s'!\n", plugin_name);
-    GNUNET_free (libname);
-    return NULL;
-  }
-  GNUNET_free (libname);
-  return ret;
-}
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_NAMECACHE_PluginFunctions *nsp;
-  ok = 0;
-  nsp = load_plugin (cfg);
-  if (NULL == nsp)
-  {
-    fprintf (stderr,
-             "%s",
-             "Failed to initialize namecache.  Database likely not setup, skipping test.\n");
-    return;
-  }
-  unload_plugin (nsp);
-}
-int
-main (int argc, char *argv[])
-{
-  char cfg_name[PATH_MAX];
-  char *const xargv[] = {
-    "test-plugin-namecache",
-    "-c",
-    cfg_name,
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  plugin_name = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
-  GNUNET_snprintf (cfg_name, sizeof(cfg_name), "test_plugin_namecache_%s.conf",
-                   plugin_name);
-  GNUNET_DISK_purge_cfg_dir (cfg_name, "GNUNET_TEST_HOME");
-  GNUNET_log_setup ("test-plugin-namecache",
-                    "WARNING",
-                    NULL);
-  GNUNET_PROGRAM_run ((sizeof(xargv) / sizeof(char *)) - 1, xargv,
-                      "test-plugin-namecache", "nohelp", options, &run, NULL);
-  if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %d\n", ok);
-  GNUNET_DISK_purge_cfg_dir (cfg_name, "GNUNET_TEST_HOME");
-  return ok;
-}
-/* end of test_plugin_namecache.c */
diff --git a/src/service/namecache/test_plugin_namecache_flat.conf b/src/service/namecache/test_plugin_namecache_flat.conf
deleted file mode 100644
index efe77e37a..000000000
--- a/src/service/namecache/test_plugin_namecache_flat.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[namecache-flat]
-FILENAME = $GNUNET_TMP/gnunet-test-plugin-namecache-flat/flatdb
diff --git a/src/service/namecache/test_plugin_namecache_postgres.conf b/src/service/namecache/test_plugin_namecache_postgres.conf
deleted file mode 100644
index 8473857d5..000000000
--- a/src/service/namecache/test_plugin_namecache_postgres.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[namestore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunetcheck
-TEMPORARY_TABLE = YES
diff --git a/src/service/namecache/test_plugin_namecache_sqlite.conf b/src/service/namecache/test_plugin_namecache_sqlite.conf
deleted file mode 100644
index 24eecd286..000000000
--- a/src/service/namecache/test_plugin_namecache_sqlite.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[namestore-sqlite]
-FILENAME = $GNUNET_TMP/gnunet-test-plugin-namestore-sqlite/sqlite.db
diff --git a/src/service/reclaim/pabc_helper.c b/src/service/reclaim/pabc_helper.c
deleted file mode 100644
index 65a633f7b..000000000
--- a/src/service/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/service/reclaim/pabc_helper.h b/src/service/reclaim/pabc_helper.h
deleted file mode 100644
index 045ad5dda..000000000
--- a/src/service/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);