contrib/uncrustify.sh

@@ -9,6 +9,6 @@ if ! uncrustify --version >/dev/null; then
   exit 1
 fi
 
-find "$DIR/../src" \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) | grep -v mustach \
+find "$DIR/../src" \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) \
   -exec uncrustify -c "$DIR/uncrustify.cfg" --replace --no-backup {} + \
   || true

src/Makefile.am

@@ -32,7 +32,5 @@ SUBDIRS = \
   auditor \
   lib \
   exchange-tools \
-  extensions/auction_brandt \
-  extensions/age_restriction \
   testing \
   benchmark

src/exchange-tools/taler-exchange-offline.c

@@ -137,11 +137,6 @@ static struct GNUNET_CURL_RescheduleContext *rc;
  */
 static const struct GNUNET_CONFIGURATION_Handle *kcfg;
 
-/**
- * Age restriction configuration
- */
-static struct TALER_AgeRestrictionConfig ar_config = {0};
-
 /**
  * Return value from main().
  */
@@ -168,6 +163,11 @@ static char *currency;
  */
 static char *CFG_exchange_url;
 
+/**
+ * If age restriction is enabled, the age mask to be used
+ */
+static struct TALER_AgeMask age_mask = {0};
+
 /**
  * A subcommand supported by this program.
  */
@@ -2386,7 +2386,6 @@ do_upload (char *const *args)
     return;
   }
   trigger_upload (CFG_exchange_url);
-
   json_decref (out);
   out = NULL;
 }
@@ -3889,7 +3888,7 @@ load_age_mask (const char*section_name)
   static const struct TALER_AgeMask null_mask = {0};
   enum GNUNET_GenericReturnValue ret;
 
-  if (! ar_config.enabled)
+  if (age_mask.bits == 0)
     return null_mask;
 
   if (GNUNET_OK != (GNUNET_CONFIGURATION_have_value (
@@ -3901,14 +3900,14 @@ load_age_mask (const char*section_name)
   ret = GNUNET_CONFIGURATION_get_value_yesno (kcfg,
                                               section_name,
                                               "AGE_RESTRICTED");
+  if (GNUNET_YES == ret)
+    return age_mask;
+
   if (GNUNET_SYSERR == ret)
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
                                section_name,
                                "AGE_RESTRICTED",
                                "Value must be YES or NO\n");
-  if (GNUNET_YES == ret)
-    return ar_config.mask;
-
   return null_mask;
 }
 
@@ -4249,7 +4248,7 @@ do_setup (char *const *args)
 static void
 do_extensions_show (char *const *args)
 {
-  const struct TALER_Extensions *it;
+  const struct TALER_Extension *it;
   json_t *exts = json_object ();
   json_t *obj;
 
@@ -4259,9 +4258,8 @@ do_extensions_show (char *const *args)
        it = it->next)
     GNUNET_assert (0 ==
                    json_object_set_new (exts,
-                                        it->extension->name,
+                                        it->name,
-                                        it->extension->config_to_json (
+                                        it->config_to_json (it)));
-                                          it->extension)));
   obj = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_object_steal ("extensions",
                                    exts));
@@ -4270,7 +4268,7 @@ do_extensions_show (char *const *args)
               json_dumps (obj,
                           JSON_INDENT (2)));
   json_decref (obj);
-  next (args);
+  next (args + 1);
 }
 
 
@@ -4283,29 +4281,25 @@ do_extensions_sign (char *const *args)
   json_t *extensions = json_object ();
   struct TALER_ExtensionConfigHashP h_config;
   struct TALER_MasterSignatureP sig;
-  const struct TALER_Extensions *it;
+  const struct TALER_Extension *it;
-  bool found = false;
   json_t *obj;
 
   GNUNET_assert (NULL != extensions);
+  if (GNUNET_OK !=
+      TALER_extensions_load_taler_config (kcfg))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "error while loading taler config for extensions\n");
+    json_decref (extensions);
+    return;
+  }
   for (it = TALER_extensions_get_head ();
        NULL != it;
        it = it->next)
-  {
-    const struct TALER_Extension *ext = it->extension;
-    GNUNET_assert (ext);
-
-    found = true;
-
     GNUNET_assert (0 ==
                    json_object_set_new (extensions,
-                                        ext->name,
+                                        it->name,
-                                        ext->config_to_json (
+                                        it->config_to_json (it)));
-                                          ext)));
-  }
-
-  if (! found)
-    return;
 
   if (GNUNET_OK !=
       TALER_JSON_extensions_config_hash (extensions,
@@ -4333,10 +4327,9 @@ do_extensions_sign (char *const *args)
     GNUNET_JSON_pack_data_auto (
       "extensions_sig",
       &sig));
-
   output_operation (OP_EXTENSIONS,
                     obj);
-  next (args);
+  next (args + 1);
 }
 
 
@@ -4403,7 +4396,6 @@ do_work_extensions (char *const *args)
     }
   };
 
-
   if (NULL == args[0])
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -4538,24 +4530,6 @@ run (void *cls,
   (void) cls;
   (void) cfgfile;
   kcfg = cfg;
-
-
-  /* load extensions */
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_extensions_load (kcfg));
-
-  /* setup age restriction, if applicable */
-  {
-    const struct TALER_AgeRestrictionConfig *arc;
-
-    if (NULL !=
-        (arc = TALER_extensions_get_age_restriction_config ()))
-    {
-      ar_config  = *arc;
-      ar_config.enabled = true;
-    }
-  }
-
   if (GNUNET_OK !=
       TALER_config_get_currency (kcfg,
                                  &currency))
@@ -4564,6 +4538,18 @@ run (void *cls,
     return;
   }
 
+  /* load age mask, if age restriction is enabled */
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_extension_age_restriction_register ());
+
+  if (GNUNET_OK != TALER_extensions_load_taler_config (kcfg))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "error while loading taler config for extensions\n");
+    return;
+  }
+  age_mask = TALER_extensions_age_restriction_ageMask ();
+
   ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
                           &rc);
   rc = GNUNET_CURL_gnunet_rc_create (ctx);
@@ -4593,6 +4579,7 @@ main (int argc,
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
+
   /* force linker to link against libtalerutil; if we do
      not do this, the linker may "optimize" libtalerutil
      away and skip #TALER_OS_init(), which we do need */

src/exchange/taler-exchange-httpd.c

@@ -97,13 +97,6 @@ static int allow_address_reuse;
  */
 const struct GNUNET_CONFIGURATION_Handle *TEH_cfg;
 
-/**
- * Configuration of age restriction
- *
- * Set after loading the library, enabled in database event handler.
- */
-struct TALER_AgeRestrictionConfig TEH_age_restriction_config = {0};
-
 /**
  * Handle to the HTTP server.
  */
@@ -145,6 +138,11 @@ char *TEH_currency;
  */
 char *TEH_base_url;
 
+/**
+ * Age restriction flags and mask
+ */
+bool TEH_age_restriction_enabled = true;
+
 /**
  * Default timeout in seconds for HTTP requests.
  */
@@ -172,7 +170,6 @@ bool TEH_suicide;
  * TALER_SIGNATURE_MASTER_EXTENSION.
  */
 struct TALER_MasterSignatureP TEH_extensions_sig;
-bool TEH_extensions_signed = false;
 
 /**
  * Value to return from main()
@@ -1041,46 +1038,6 @@ handle_post_auditors (struct TEH_RequestContext *rc,
 }
 
 
-/**
- * Handle POST "/extensions/..." requests.
- *
- * @param rc request context
- * @param root uploaded JSON data
- * @param args array of additional options
- * @return MHD result code
- */
-static MHD_RESULT
-handle_post_extensions (struct TEH_RequestContext *rc,
-                        const json_t *root,
-                        const char *const args[])
-{
-  const struct TALER_Extension *ext = NULL;
-
-  if (NULL == args[0])
-  {
-    GNUNET_break_op (0);
-    return r404 (rc->connection,
-                 "/extensions/$EXTENSION");
-  }
-
-  ext = TALER_extensions_get_by_name (args[0]);
-  if (NULL == ext)
-  {
-    GNUNET_break_op (0);
-    return r404 (rc->connection,
-                 "/extensions/$EXTENSION unknown");
-  }
-
-  if (NULL == ext->http_post_handler)
-    return MHD_HTTP_NOT_IMPLEMENTED;
-
-  return ext->http_post_handler (
-    rc->connection,
-    root,
-    &args[1]);
-}
-
-
 /**
  * Handle incoming HTTP request.
  *
@@ -1298,14 +1255,6 @@ handle_mhd_request (void *cls,
       .nargs = 4,
       .nargs_is_upper_bound = true
     },
-    /* extensions endpoints */
-    {
-      .url = "extensions",
-      .method = MHD_HTTP_METHOD_POST,
-      .handler.post = &handle_post_extensions,
-      .nargs = 4, /* Arbitrary upper bound */
-      .nargs_is_upper_bound = true,
-    },
     /* mark end of list */
     {
       .url = NULL

src/exchange/taler-exchange-httpd.h

@@ -197,6 +197,11 @@ extern struct TALER_EXCHANGEDB_Plugin *TEH_plugin;
  */
 extern char *TEH_currency;
 
+/*
+ * Age restriction extension state
+ */
+extern bool TEH_age_restriction_enabled;
+
 /**
  * Our (externally visible) base URL.
  */
@@ -216,7 +221,6 @@ extern struct GNUNET_CURL_Context *TEH_curl_ctx;
  * Signature of the offline master key of all enabled extensions' configuration
  */
 extern struct TALER_MasterSignatureP TEH_extensions_sig;
-extern bool TEH_extensions_signed;
 
 /**
  * @brief Struct describing an URL and the handler for it.
@@ -362,7 +366,4 @@ struct TEH_RequestHandler
 };
 
 
-/* Age restriction configuration */
-extern struct TALER_AgeRestrictionConfig TEH_age_restriction_config;
-
 #endif

src/exchange/taler-exchange-httpd_extensions.c

@@ -100,9 +100,6 @@ extension_update_event_cb (void *cls,
     // No config found -> disable extension
     if (NULL == config_str)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "No configuration found for extension %s, disabling it\n",
-                  extension->name);
       extension->disable ((struct TALER_Extension *) extension);
       return;
     }
@@ -117,40 +114,28 @@ extension_update_event_cb (void *cls,
                   err.text,
                   err.source);
       GNUNET_break (0);
-      free(config_str);
       return;
     }
 
     // Call the parser for the extension
     ret = extension->load_json_config (
       (struct TALER_Extension *) extension,
-      json_object_get(config, "config"));
+      config);
 
     if (GNUNET_OK != ret)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Couldn't parse configuration for extension %s from the database: %s\n",
+                  "Couldn't parse configuration for extension %s from the database",
-                  extension->name,
+                  extension->name);
-		  config_str);
       GNUNET_break (0);
     }
-
-    free(config_str);
-    json_decref(config);
   }
 
   /* Special case age restriction: Update global flag and mask  */
   if (TALER_Extension_AgeRestriction == type)
   {
-    const struct TALER_AgeRestrictionConfig *conf =
+    TEH_age_restriction_enabled =
-      TALER_extensions_get_age_restriction_config ();
+      TALER_extensions_age_restriction_is_enabled ();
-    if (NULL != conf)
-      TEH_age_restriction_config = *conf;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "[age restriction] DB event has changed the config to %s with mask: %s\n",
-                conf->enabled ? "enabled": "disabled",
-                TALER_age_mask_to_string (&conf->mask));
-
   }
 }
 
@@ -158,21 +143,14 @@ extension_update_event_cb (void *cls,
 enum GNUNET_GenericReturnValue
 TEH_extensions_init ()
 {
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_extension_age_restriction_register ());
+
   /* Set the event handler for updates */
   struct GNUNET_DB_EventHeaderP ev = {
     .size = htons (sizeof (ev)),
     .type = htons (TALER_DBEVENT_EXCHANGE_EXTENSIONS_UPDATED),
   };
-
-  /* Load the shared libraries first */
-  if (GNUNET_OK !=
-      TALER_extensions_load (TEH_cfg))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "failed to load extensions");
-    return GNUNET_SYSERR;
-  }
-
   extensions_eh = TEH_plugin->event_listen (TEH_plugin->cls,
                                             GNUNET_TIME_UNIT_FOREVER_REL,
                                             &ev,
@@ -184,20 +162,17 @@ TEH_extensions_init ()
     return GNUNET_SYSERR;
   }
 
-  /* Trigger the initial load of configuration from the db */
+  /* FIXME #7270: shall we load the extensions from the config right away?
-  for (const struct TALER_Extensions *it = TALER_extensions_get_head ();
+   * We do have to for now, as otherwise denominations with age restriction
-       NULL != it && NULL != it->extension;
+   * will not have the age mask set right upon initial generation.
-       it = it->next)
+   */
-  {
+  TALER_extensions_load_taler_config (TEH_cfg);
-    const struct TALER_Extension *ext = it->extension;
-    char *conf = json_dumps (ext->config_to_json (ext), JSON_COMPACT);
 
-    TEH_plugin->set_extension_config (TEH_plugin->cls,
+  /* Trigger the initial load of configuration from the db */
-                                      ext->name,
+  for (const struct TALER_Extension *it = TALER_extensions_get_head ();
-                                      conf);
+       NULL != it->next;
-    extension_update_event_cb (NULL, &ext->type, sizeof(ext->type));
+       it = it->next)
-    free (conf);
+    extension_update_event_cb (NULL, &it->type, sizeof(it->type));
-  }
 
   return GNUNET_OK;
 }

src/exchange/taler-exchange-httpd_keys.c

@@ -815,7 +815,10 @@ static struct TALER_AgeMask
 load_age_mask (const char*section_name)
 {
   static const struct TALER_AgeMask null_mask = {0};
-  enum GNUNET_GenericReturnValue ret;
+  struct TALER_AgeMask age_mask = TALER_extensions_age_restriction_ageMask ();
+
+  if (age_mask.bits == 0)
+    return null_mask;
 
   if (GNUNET_OK != (GNUNET_CONFIGURATION_have_value (
                       TEH_cfg,
@@ -823,29 +826,22 @@ load_age_mask (const char*section_name)
                       "AGE_RESTRICTED")))
     return null_mask;
 
-  if (GNUNET_SYSERR ==
-      (ret = GNUNET_CONFIGURATION_get_value_yesno (TEH_cfg,
-                                                   section_name,
-                                                   "AGE_RESTRICTED")))
   {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+    enum GNUNET_GenericReturnValue ret;
-                               section_name,
+
-                               "AGE_RESTRICTED",
+    if (GNUNET_SYSERR ==
-                               "Value must be YES or NO\n");
+        (ret = GNUNET_CONFIGURATION_get_value_yesno (TEH_cfg,
-    return null_mask;
+                                                     section_name,
+                                                     "AGE_RESTRICTED")))
+    {
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 section_name,
+                                 "AGE_RESTRICTED",
+                                 "Value must be YES or NO\n");
+      return null_mask;
+    }
   }
-
+  return age_mask;
-  if (GNUNET_OK == ret)
-  {
-    if (! TEH_age_restriction_config.enabled)
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "age restriction set in section %s, yet, age restriction is not enabled\n",
-                  section_name);
-    return TEH_age_restriction_config.mask;
-  }
-
-
-  return null_mask;
 }
 
 
@@ -1902,29 +1898,34 @@ create_krd (struct TEH_KeyStateHandle *ksh,
     bool has_extensions = false;
 
     /* Fill in the configurations of the enabled extensions */
-    for (const struct TALER_Extensions *iter = TALER_extensions_get_head ();
+    for (const struct TALER_Extension *extension = TALER_extensions_get_head ();
-         NULL != iter && NULL != iter->extension;
+         NULL != extension;
-         iter = iter->next)
+         extension = extension->next)
     {
-      const struct TALER_Extension *extension = iter->extension;
       json_t *ext;
+      json_t *config_json;
       int r;
 
-      /* skip if not enabled */
+      /* skip if not configured == disabled */
-      if (! extension->enabled)
+      if (NULL == extension->config ||
+          NULL == extension->config_json)
         continue;
 
       /* flag our findings so far */
       has_extensions = true;
+
       GNUNET_assert (NULL != extension->config_json);
 
+      config_json = json_copy (extension->config_json);
+      GNUNET_assert (NULL != config_json);
+
       ext = GNUNET_JSON_PACK (
         GNUNET_JSON_pack_bool ("critical",
                                extension->critical),
         GNUNET_JSON_pack_string ("version",
                                  extension->version),
-        GNUNET_JSON_pack_object_incref ("config",
+        GNUNET_JSON_pack_object_steal ("config",
-                                        extension->config_json)
+                                       config_json)
         );
       GNUNET_assert (NULL != ext);
 
@@ -1947,16 +1948,12 @@ create_krd (struct TEH_KeyStateHandle *ksh,
         extensions);
       GNUNET_assert (0 == r);
 
-      /* Add the signature of the extensions, if it is not zero */
+      sig = GNUNET_JSON_PACK (
-      if (TEH_extensions_signed)
+        GNUNET_JSON_pack_data_auto ("extensions_sig",
-      {
+                                    &TEH_extensions_sig));
-        sig = GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_data_auto ("extensions_sig",
-                                      &TEH_extensions_sig));
 
-        r = json_object_update (keys, sig);
+      r = json_object_update (keys, sig);
-        GNUNET_assert (0 == r);
+      GNUNET_assert (0 == r);
-      }
     }
     else
     {
@@ -2563,7 +2560,6 @@ build_key_state (struct HelperState *hs,
                        true);
     return NULL;
   }
-
   /* NOTE: ONLY fetches non-revoked AND master-signed signkeys! */
   qs = TEH_plugin->iterate_active_signkeys (TEH_plugin->cls,
                                             &signkey_info_cb,

src/exchange/taler-exchange-httpd_management_extensions.c

@@ -108,8 +108,6 @@ set_extensions (void *cls,
       taler_ext->name,
       config);
 
-    free (config);
-
     if (qs < 0)
     {
       if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -139,7 +137,6 @@ set_extensions (void *cls,
 
   /* All extensions configured, update the signature */
   TEH_extensions_sig = sec->extensions_sig;
-  TEH_extensions_signed = true;
 
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; /* only 'success', so >=0, matters here */
 }

src/exchange/taler-exchange-httpd_refreshes_reveal.c

@@ -603,7 +603,7 @@ resolve_refreshes_reveal_denominations (
                         &rrc->coin_envelope_hash);
   }
 
-  if (TEH_age_restriction_config.enabled &&
+  if (TEH_age_restriction_enabled &&
       ((NULL == old_age_commitment_json) !=
        TALER_AgeCommitmentHash_isNullOrZero (
          &rctx->melt.session.coin.h_age_commitment)))
@@ -614,7 +614,7 @@ resolve_refreshes_reveal_denominations (
 
   /* Reconstruct the old age commitment and verify its hash matches the one
    * from the melt request */
-  if (TEH_age_restriction_config.enabled &&
+  if (TEH_age_restriction_enabled &&
       (NULL != old_age_commitment_json))
   {
     enum GNUNET_GenericReturnValue res;
@@ -623,7 +623,8 @@ resolve_refreshes_reveal_denominations (
     bool failed = true;
 
     /* Has been checked in handle_refreshes_reveal_json() */
-    GNUNET_assert (ng == TEH_age_restriction_config.num_groups);
+    GNUNET_assert (ng ==
+                   TALER_extensions_age_restriction_num_groups ());
 
     rctx->old_age_commitment = GNUNET_new (struct TALER_AgeCommitment);
     oac = rctx->old_age_commitment;
@@ -930,7 +931,7 @@ handle_refreshes_reveal_json (struct MHD_Connection *connection,
   /* Sanity check of age commitment: If it was provided, it _must_ be an array
    * of the size the # of age groups */
   if (NULL != old_age_commitment_json
-      && TEH_age_restriction_config.num_groups !=
+      && TALER_extensions_age_restriction_num_groups () !=
       json_array_size (old_age_commitment_json))
   {
     GNUNET_break_op (0);

src/extensions/Makefile.am

@@ -11,7 +11,7 @@ if USE_COVERAGE
 endif
 
 
-# Basic extension handling library
+# Libraries
 
 lib_LTLIBRARIES = \
   libtalerextensions.la
@@ -22,7 +22,7 @@ libtalerextensions_la_LDFLAGS = \
 
 libtalerextensions_la_SOURCES = \
   extensions.c \
-  age_restriction_helper.c
+  extension_age_restriction.c
 
 libtalerextensions_la_LIBADD = \
   $(top_builddir)/src/json/libtalerjson.la \
@@ -31,4 +31,3 @@ libtalerextensions_la_LIBADD = \
   -lgnunetutil \
   -ljansson \
   $(XLIB)
-

src/extensions/age_restriction/Makefile.am

@@ -1,33 +0,0 @@
-# This Makefile.am is in the public domain
-
-AM_CPPFLAGS = \
-  -I$(top_srcdir)/src/include \
-  $(LIBGCRYPT_CFLAGS) \
-  $(POSTGRESQL_CPPFLAGS)
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-# Age restriction as extension library
-
-plugindir = $(libdir)/taler
-
-plugin_LTLIBRARIES = \
-  libtaler_extension_age_restriction.la
-
-libtaler_extension_age_restriction_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-
-libtaler_extension_age_restriction_la_SOURCES = \
-  extension_age_restriction.c
-
-libtaler_extension_auctionbrandt_la_LIBADD = \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)

src/extensions/age_restriction_helper.c

@@ -1,74 +0,0 @@
-/*
-   This file is part of TALER
-   Copyright (C) 2022- Taler Systems SA
-
-   TALER is free software; you can redistribute it and/or modify it under the
-   terms of the GNU General Public License as published by the Free Software
-   Foundation; either version 3, or (at your option) any later version.
-
-   TALER 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along with
-   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
- */
-/**
- * @file age_restriction_helper.c
- * @brief Helper functions for age restriction
- * @author Özgür Kesim
- */
-
-#include "platform.h"
-#include "taler_util.h"
-#include "taler_signatures.h"
-#include "taler_extensions.h"
-#include "stdint.h"
-
-
-const struct TALER_AgeRestrictionConfig *
-TALER_extensions_get_age_restriction_config ()
-{
-  const struct TALER_Extension *ext;
-
-  ext = TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
-  if (NULL == ext)
-    return NULL;
-
-  return ext->config;
-}
-
-
-bool
-TALER_extensions_is_age_restriction_enabled ()
-{
-  const struct TALER_Extension *ext;
-
-  ext = TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
-  if (NULL == ext)
-    return false;
-
-  return ext->enabled;
-}
-
-
-struct TALER_AgeMask
-TALER_extensions_get_age_restriction_mask ()
-{
-  const struct TALER_Extension *ext;
-  const struct TALER_AgeRestrictionConfig *conf;
-
-  ext = TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
-
-  if ((NULL == ext) ||
-      (NULL == ext->config) ||
-      (! ext->enabled))
-    return (struct TALER_AgeMask) {0}
-  ;
-
-  conf = ext->config;
-  return conf->mask;
-}
-
-
-/* end age_restriction_helper.c */

src/extensions/auction_brandt/Makefile.am

@@ -1,34 +0,0 @@
-# This Makefile.am is in the public domain
-
-AM_CPPFLAGS = \
-  -I$(top_srcdir)/src/include \
-  $(LIBGCRYPT_CFLAGS) \
-  $(POSTGRESQL_CPPFLAGS)
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-
-# Auction of Brandt type as extension library
-
-plugindir = $(libdir)/taler
-
-plugin_LTLIBRARIES = \
-  libtaler_extension_auction_brandt.la
-
-libtaler_extension_auction_brandt_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-
-libtaler_extension_auction_brandt_la_SOURCES = \
-  extension_auction_brandt.c
-
-libtaler_extension_auction_brandt_la_LIBADD = \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)

src/extensions/auction_brandt/extension_auction_brandt.c

@@ -1,182 +0,0 @@
-/*
-   This file is part of TALER
-   Copyright (C) 2021-2022 Taler Systems SA
-
-   TALER is free software; you can redistribute it and/or modify it under the
-   terms of the GNU General Public License as published by the Free Software
-   Foundation; either version 3, or (at your option) any later version.
-
-   TALER 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along with
-   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
- */
-/**
- * @file extension_auction_brandt.c
- * @brief Extension for replay of auctions of type brandt
- * @author Özgür Kesim
- */
-#include "platform.h"
-#include "taler_util.h"
-#include "taler_extensions.h"
-#include "../../exchange/taler-exchange-httpd.h"
-#include "taler_mhd_lib.h"
-#include "stdint.h"
-#include <microhttpd.h>
-
-#define EXTENSION_NAME "auction_brandt"
-
-/* Path to the replay program. */
-static char *replay_program;
-
-/**
- * @brief implements the TALER_Extension.disable interface.
- *
- * @param ext Pointer to the current extension
- */
-static void
-auction_disable (
-  struct TALER_Extension *ext)
-{
-  ext->enabled = false;
-}
-
-
-/**
- * @brief implements the TALER_Extension.test_json_config interface.
- *
- * @param config configuration as json_t* to test
- * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise.
- */
-static enum GNUNET_GenericReturnValue
-auction_test_json_config (
-  const json_t *config)
-{
-  /* This extension has no configuration */
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief implements the TALER_Extension.config_to_json interface.
- *
- * @param ext if NULL, only tests the configuration
- * @return configuration as json_t* object, maybe NULL
- */
-static json_t *
-auction_config_to_json (
-  const struct TALER_Extension *ext)
-{
-  /* This extension has no configuration */
-  return json_null ();
-}
-
-
-/**
- * @brief implements the TALER_Extension.load_json_config interface.
- *
- * @param ext if NULL, only tests the configuration
- * @param jconfig the configuration as json
- */
-static enum GNUNET_GenericReturnValue
-auction_load_json_config (
-  struct TALER_Extension *ext,
-  json_t *jconfig)
-{
-  /* This extension has no configuration */
-  ext->enabled = true;
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief implements the TALER_Extension.http_post_handler
- */
-
-static MHD_RESULT
-auction_http_post_handler (
-  struct MHD_Connection *connection,
-  const json_t *root,
-  const char *const args[])
-{
-  /* TODO */
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "auction_http_post_handler not implemented yet");
-  return MHD_HTTP_NOT_IMPLEMENTED;
-}
-
-
-/* The extension struct for auctions of brandt-style */
-struct TALER_Extension TE_auction_brandt = {
-  .type = 0x0815, /* TODO: where do we get this from? */
-  .name = EXTENSION_NAME,
-  .critical = false,
-  .version = "0",
-  .enabled = false, /* disabled per default */
-  .config = NULL,
-  .config_json = NULL,
-  .disable = &auction_disable,
-  .test_json_config = &auction_test_json_config,
-  .load_json_config = &auction_load_json_config,
-  .config_to_json = &auction_config_to_json,
-  .http_post_handler = &auction_http_post_handler,
-};
-
-
-/* TODO: sql handler */
-
-/**
- * ===========================================
- *  Handler for GNUNET_PLUGIN_load and _unload
- * ===========================================
- */
-
-/**
- * @brief Initialization function for the extension.
- *        Will be called by GNUNET_PLUGIN_load.
- *
- * @param arg Configuration - ptr to GNUNET_CONFIGURATION_Handle
- * @return Pointer to TE_auction_brandt
- */
-struct TALER_Extension *
-init (void *arg)
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg = arg;
-
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "extension_" EXTENSION_NAME,
-                                             "replay_program",
-                                             &replay_program))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "extension_" EXTENSION_NAME,
-                               "replay_program");
-    return NULL;
-  }
-
-  return &TE_auction_brandt;
-}
-
-/**
- * @brief Tear-down function for the extension.
- *        Will be called by GNUNET_PLUGIN_unload.
- *
- * @param ignored
- * @return null
- */
-void *
-done (void *arg)
-{
-	auction_disable(&TE_auction_brandt);
-	GNUNET_free(replay_program);
-	replay_program=NULL;
-
-	return NULL;
-}
-
-
-
-/* end of extension_auction_brandt.c */

src/extensions/extension_age_restriction.c

@@ -23,6 +23,102 @@
 #include "taler_extensions.h"
 #include "stdint.h"
 
+/**
+ * Carries all the information we need for age restriction
+ */
+struct age_restriction_config
+{
+  struct TALER_AgeMask mask;
+  size_t num_groups;
+};
+
+/**
+ * Global config for this extension
+ */
+static struct age_restriction_config TE_age_restriction_config = {0};
+
+enum GNUNET_GenericReturnValue
+TALER_parse_age_group_string (
+  const char *groups,
+  struct TALER_AgeMask *mask)
+{
+
+  const char *pos = groups;
+  unsigned int prev = 0;
+  unsigned int val = 0;
+  char c;
+
+  while (*pos)
+  {
+    c = *pos++;
+    if (':' == c)
+    {
+      if (prev >= val)
+        return GNUNET_SYSERR;
+
+      mask->bits |= 1 << val;
+      prev = val;
+      val = 0;
+      continue;
+    }
+
+    if ('0'>c || '9'<c)
+      return GNUNET_SYSERR;
+
+    val = 10 * val + c - '0';
+
+    if (0>=val || 32<=val)
+      return GNUNET_SYSERR;
+  }
+
+  if (32<=val || prev>=val)
+    return GNUNET_SYSERR;
+
+  mask->bits |= (1 << val);
+  mask->bits |= 1; // mark zeroth group, too
+
+  return GNUNET_OK;
+}
+
+
+char *
+TALER_age_mask_to_string (
+  const struct TALER_AgeMask *mask)
+{
+  uint32_t bits = mask->bits;
+  unsigned int n = 0;
+  char *buf = GNUNET_malloc (32 * 3); // max characters possible
+  char *pos = buf;
+
+  if (NULL == buf)
+  {
+    return buf;
+  }
+
+  while (bits != 0)
+  {
+    bits >>= 1;
+    n++;
+    if (0 == (bits & 1))
+    {
+      continue;
+    }
+
+    if (n > 9)
+    {
+      *(pos++) = '0' + n / 10;
+    }
+    *(pos++) = '0' + n % 10;
+
+    if (0 != (bits >> 1))
+    {
+      *(pos++) = ':';
+    }
+  }
+  return buf;
+}
+
+
 /* ==================================================
  *
  * Age Restriction  TALER_Extension implementation
@@ -30,25 +126,18 @@
  * ==================================================
  */
 
-/**
- * @brief local configuration
- */
-
-static struct TALER_AgeRestrictionConfig AR_config = {0};
-
 /**
  * @brief implements the TALER_Extension.disable interface.
  *
  * @param ext Pointer to the current extension
  */
-static void
+void
 age_restriction_disable (
   struct TALER_Extension *ext)
 {
   if (NULL == ext)
     return;
 
-  ext->enabled = false;
   ext->config = NULL;
 
   if (NULL != ext->config_json)
@@ -57,9 +146,86 @@ age_restriction_disable (
     ext->config_json = NULL;
   }
 
-  AR_config.enabled = false;
+  TE_age_restriction_config.mask.bits = 0;
-  AR_config.mask.bits = 0;
+  TE_age_restriction_config.num_groups = 0;
-  AR_config.num_groups = 0;
+}
+
+
+/**
+ * @brief implements the TALER_Extension.load_taler_config interface.
+ *
+ * @param ext Pointer to the current extension
+ * @param cfg Handle to the GNUNET configuration
+ * @return Error if extension for age restriction was set, but age groups were
+ *         invalid, OK otherwise.
+ */
+static enum GNUNET_GenericReturnValue
+age_restriction_load_taler_config (
+  struct TALER_Extension *ext,
+  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *groups = NULL;
+  enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
+  struct TALER_AgeMask mask = {0};
+
+  if ((GNUNET_YES !=
+       GNUNET_CONFIGURATION_have_value (cfg,
+                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                        "ENABLED"))
+      ||
+      (GNUNET_YES !=
+       GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                             TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                             "ENABLED")))
+  {
+    /* Age restriction is not enabled */
+    ext->config = NULL;
+    ext->config_json = NULL;
+    return GNUNET_OK;
+  }
+
+  /* Age restriction is enabled, extract age groups */
+  if ((GNUNET_YES ==
+       GNUNET_CONFIGURATION_have_value (cfg,
+                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                        "AGE_GROUPS"))
+      &&
+      (GNUNET_YES !=
+       GNUNET_CONFIGURATION_get_value_string (cfg,
+                                              TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                              "AGE_GROUPS",
+                                              &groups)))
+    return GNUNET_SYSERR;
+
+
+  mask.bits = TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_MASK;
+  ret = GNUNET_OK;
+
+  if (groups != NULL)
+  {
+    ret = TALER_parse_age_group_string (groups, &mask);
+    if (GNUNET_OK != ret)
+      mask.bits = TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_MASK;
+  }
+
+  if (GNUNET_OK == ret)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "setting age mask to %x with #groups: %d\n", mask.bits,
+                __builtin_popcount (mask.bits) - 1);
+    TE_age_restriction_config.mask.bits = mask.bits;
+    TE_age_restriction_config.num_groups = __builtin_popcount (mask.bits) - 1; /* no underflow, first bit always set */
+    ext->config = &TE_age_restriction_config;
+
+    /* Note: we do now have TE_age_restriction_config set, however
+     * ext->config_json is NOT set, i.e. the extension is not yet active! For
+     * age restriction to become active, load_json_config must have been
+     * called. */
+  }
+
+
+  GNUNET_free (groups);
+  return ret;
 }
 
 
@@ -88,25 +254,24 @@ age_restriction_load_json_config (
   if (TALER_Extension_AgeRestriction != ext->type)
     return GNUNET_SYSERR;
 
+  TE_age_restriction_config.mask.bits = mask.bits;
+  TE_age_restriction_config.num_groups = 0;
+
   if (mask.bits > 0)
   {
     /* if the mask is not zero, the first bit MUST be set */
     if (0 == (mask.bits & 1))
       return GNUNET_SYSERR;
 
-    AR_config.mask.bits = mask.bits;
+    TE_age_restriction_config.num_groups = __builtin_popcount (mask.bits) - 1;
-    AR_config.num_groups = __builtin_popcount (mask.bits) - 1;
   }
 
-  AR_config.enabled = true;
+  ext->config = &TE_age_restriction_config;
-  ext->config = &AR_config;
 
   if (NULL != ext->config_json)
     json_decref (ext->config_json);
 
-  ext->enabled = true;
+  ext->config_json = jconfig;
-  ext->config_json = json_copy(jconfig);
-  json_decref(jconfig);
 
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "loaded new age restriction config with age groups: %s\n",
@@ -117,12 +282,12 @@ age_restriction_load_json_config (
 
 
 /**
- * @brief implements the TALER_Extension.config_to_json interface.
+ * @brief implements the TALER_Extension.load_json_config interface.
  *
  * @param ext if NULL, only tests the configuration
- * @return configuration as json_t* object, maybe NULL
+ * @return configuration as json_t* object
  */
-static json_t *
+json_t *
 age_restriction_config_to_json (
   const struct TALER_Extension *ext)
 {
@@ -130,33 +295,18 @@ age_restriction_config_to_json (
   json_t *conf;
 
   GNUNET_assert (NULL != ext);
-
+  GNUNET_assert (NULL != ext->config);
-  if (! ext->enabled)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "age restriction not enabled");
-    return json_null ();
-  }
-
-  if (NULL == ext->config)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "age restriction not configured");
-    return json_null ();
-  }
 
   if (NULL != ext->config_json)
   {
     return json_copy (ext->config_json);
   }
 
-  mask_str = TALER_age_mask_to_string (&AR_config.mask);
+  mask_str = TALER_age_mask_to_string (&TE_age_restriction_config.mask);
   conf = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_string ("age_groups", mask_str)
     );
 
-  free(mask_str);
-
   return GNUNET_JSON_PACK (
     GNUNET_JSON_pack_bool ("critical", ext->critical),
     GNUNET_JSON_pack_string ("version", ext->version),
@@ -182,119 +332,71 @@ age_restriction_test_json_config (
 
 
 /* The extension for age restriction */
-struct TALER_Extension TE_extension_age_restriction = {
+struct TALER_Extension TE_age_restriction = {
+  .next = NULL,
   .type = TALER_Extension_AgeRestriction,
   .name = "age_restriction",
   .critical = false,
   .version = "1",
-  .enabled = false, /* disabled per default */
+  .config = NULL,   // disabled per default
-  .config = NULL,
   .config_json = NULL,
   .disable = &age_restriction_disable,
   .test_json_config = &age_restriction_test_json_config,
   .load_json_config = &age_restriction_load_json_config,
   .config_to_json = &age_restriction_config_to_json,
-  .http_post_handler = NULL,
+  .load_taler_config = &age_restriction_load_taler_config,
 };
 
-
+enum GNUNET_GenericReturnValue
-/**
+TALER_extension_age_restriction_register ()
- * @brief implements the init() function for GNUNET_PLUGIN_load
- *
- * @param arg Pointer to the GNUNET_CONFIGURATION_Handle
- * @return pointer to TALER_Extension on success or NULL otherwise.
- */
-void *
-libtaler_extension_age_restriction_init (void *arg)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = arg;
+  return TALER_extensions_add (&TE_age_restriction);
-  char *groups = NULL;
-  struct TALER_AgeMask mask = {0};
-
-  if ((GNUNET_YES !=
-       GNUNET_CONFIGURATION_have_value (cfg,
-                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                        "ENABLED"))
-      ||
-      (GNUNET_YES !=
-       GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                             TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                             "ENABLED")))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "[age restriction] no section %s found in configuration\n",
-                TALER_EXTENSION_SECTION_AGE_RESTRICTION);
-
-    return NULL;
-  }
-
-  /* Age restriction is enabled, extract age groups */
-  if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (cfg,
-                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                        "AGE_GROUPS"))
-      &&
-      (GNUNET_YES !=
-       GNUNET_CONFIGURATION_get_value_string (cfg,
-                                              TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                              "AGE_GROUPS",
-                                              &groups)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "[age restriction] AGE_GROUPS in %s is not a string\n",
-                TALER_EXTENSION_SECTION_AGE_RESTRICTION);
-
-    return NULL;
-  }
-
-  mask.bits = TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_MASK;
-
-  if ((groups != NULL) &&
-      (GNUNET_OK != TALER_parse_age_group_string (groups, &mask)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "[age restriction] couldn't parse age groups: '%s'\n",
-                groups);
-    return NULL;
-  }
-
-  AR_config.mask = mask;
-  AR_config.num_groups = __builtin_popcount (mask.bits) - 1;   /* no underflow, first bit always set */
-  AR_config.enabled = true;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "[age restriction] setting age mask to %s with #groups: %d\n",
-              TALER_age_mask_to_string(&AR_config.mask),
-              __builtin_popcount (AR_config.mask.bits) - 1);
-
-  TE_extension_age_restriction.config = &AR_config;
-  TE_extension_age_restriction.enabled = true;
-
-  /* Note: we do now have TE_age_restriction_config set, however
-   * ext->config_json is NOT set, i.e. the extension is not yet active! For
-   * age restriction to become active, load_json_config must have been
-   * called. */
-
-  GNUNET_free (groups);
-  return &TE_extension_age_restriction;
 }
 
 
-/**
+bool
- * @brief implements the done() function for GNUNET_PLUGIN_load
+TALER_extensions_age_restriction_is_configured ()
- *
- * @param cfg unsued
- * @return pointer to TALER_Extension on success or NULL otherwise.
- */
-void *
-libtaler_extension_age_restriction_done (void *arg)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  return (0 != TE_age_restriction_config.mask.bits);
-              "[age restriction] disabling and unloading");
+}
-  AR_config.enabled = 0;
+
-  AR_config.mask.bits = 0;
+
-  AR_config.num_groups = 0;
+struct TALER_AgeMask
-  return NULL;
+TALER_extensions_age_restriction_ageMask ()
+{
+  return TE_age_restriction_config.mask;
+}
+
+
+size_t
+TALER_extensions_age_restriction_num_groups ()
+{
+  return TE_age_restriction_config.num_groups;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_JSON_parse_age_groups (const json_t *root,
+                             struct TALER_AgeMask *mask)
+{
+  enum GNUNET_GenericReturnValue ret;
+  const char *str;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("age_groups",
+                             &str),
+    GNUNET_JSON_spec_end ()
+  };
+
+  ret = GNUNET_JSON_parse (root,
+                           spec,
+                           NULL,
+                           NULL);
+  if (GNUNET_OK == ret)
+    TALER_parse_age_group_string (str, mask);
+
+  GNUNET_JSON_parse_free (spec);
+
+  return ret;
 }
 
 

src/extensions/extensions.c

@@ -24,22 +24,21 @@
 #include "taler_extensions.h"
 #include "stdint.h"
 
-/* head of the list of all registered extensions */
-static struct TALER_Extensions TE_extensions = {
-  .next = NULL,
-  .extension = NULL,
-};
 
-const struct TALER_Extensions *
+/* head of the list of all registered extensions */
+static struct TALER_Extension *TE_extensions = NULL;
+
+
+const struct TALER_Extension *
 TALER_extensions_get_head ()
 {
-  return &TE_extensions;
+  return TE_extensions;
 }
 
 
-static enum GNUNET_GenericReturnValue
+enum GNUNET_GenericReturnValue
-add_extension (
+TALER_extensions_add (
-  const struct TALER_Extension *extension)
+  struct TALER_Extension *extension)
 {
   /* Sanity checks */
   if ((NULL == extension) ||
@@ -48,30 +47,28 @@ add_extension (
       (NULL == extension->disable) ||
       (NULL == extension->test_json_config) ||
       (NULL == extension->load_json_config) ||
-      (NULL == extension->config_to_json))
+      (NULL == extension->config_to_json) ||
+      (NULL == extension->load_taler_config))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "invalid extension\n");
     return GNUNET_SYSERR;
   }
 
-  if (NULL == TE_extensions.extension) /* first extension ?*/
+  if (NULL == TE_extensions) /* first extension ?*/
-    TE_extensions.extension = extension;
+    TE_extensions = (struct TALER_Extension *) extension;
   else
   {
-    struct TALER_Extensions *iter;
+    struct TALER_Extension *iter;
-    struct TALER_Extensions *last;
+    struct TALER_Extension *last;
 
     /* Check for collisions */
-    for (iter = &TE_extensions;
+    for (iter = TE_extensions; NULL != iter; iter = iter->next)
-         NULL != iter && NULL != iter->extension;
-         iter = iter->next)
     {
-      const struct TALER_Extension *ext = iter->extension;
       last = iter;
-      if (extension->type == ext->type ||
+      if (extension->type == iter->type ||
           0 == strcasecmp (extension->name,
-                           ext->name))
+                           iter->name))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "extension collision for `%s'\n",
@@ -81,11 +78,7 @@ add_extension (
     }
 
     /* No collisions found, so add this extension to the list */
-    {
+    last->next = extension;
-      struct TALER_Extensions *extn = GNUNET_new (struct TALER_Extensions);
-      extn->extension = extension;
-      last->next = extn;
-    }
   }
 
   return GNUNET_OK;
@@ -96,12 +89,12 @@ const struct TALER_Extension *
 TALER_extensions_get_by_type (
   enum TALER_Extension_Type type)
 {
-  for (const struct TALER_Extensions *it = &TE_extensions;
+  for (const struct TALER_Extension *it = TE_extensions;
-       NULL != it && NULL != it->extension;
+       NULL != it;
        it = it->next)
   {
-    if (it->extension->type == type)
+    if (it->type == type)
-      return it->extension;
+      return it;
   }
 
   /* No extension found. */
@@ -116,7 +109,8 @@ TALER_extensions_is_enabled_type (
   const struct TALER_Extension *ext =
     TALER_extensions_get_by_type (type);
 
-  return (NULL != ext && ext->enabled);
+  return (NULL != ext &&
+          TALER_extensions_is_enabled (ext));
 }
 
 
@@ -124,15 +118,14 @@ const struct TALER_Extension *
 TALER_extensions_get_by_name (
   const char *name)
 {
-  for (const struct TALER_Extensions *it = &TE_extensions;
+  for (const struct TALER_Extension *it = TE_extensions;
        NULL != it;
        it = it->next)
   {
-    if (0 == strcasecmp (name, it->extension->name))
+    if (0 == strcasecmp (name, it->name))
-      return it->extension;
+      return it;
   }
-  /* No extension found, try to load it. */
+  /* No extension found. */
-
   return NULL;
 }
 
@@ -185,8 +178,7 @@ configure_extension (
 {
   struct LoadConfClosure *col = cls;
   const char *name;
-  char *lib_name;
+  const struct TALER_Extension *extension;
-  struct TALER_Extension *extension;
 
   if (GNUNET_OK != col->error)
     return;
@@ -198,49 +190,33 @@ configure_extension (
 
   name = section + sizeof(TALER_EXTENSION_SECTION_PREFIX) - 1;
 
-
+  if (NULL ==
-  /* Load the extension library */
+      (extension = TALER_extensions_get_by_name (name)))
-  GNUNET_asprintf (&lib_name,
-                   "libtaler_extension_%s",
-                   name);
-  extension = GNUNET_PLUGIN_load (
-    lib_name,
-    (void *) col->cfg);
-  if (NULL == extension)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Couldn't load extension library to `%s` (section [%s]).\n",
+                "Unsupported extension `%s` (section [%s]).\n", name,
-                name,
                 section);
     col->error = GNUNET_SYSERR;
     return;
   }
 
-
+  if (GNUNET_OK !=
-  if (GNUNET_OK != add_extension (extension))
+      extension->load_taler_config (
+        (struct TALER_Extension *) extension,
+        col->cfg))
   {
-    /* TODO: Ignoring return values here */
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Couldn't add extension `%s` (section [%s]).\n",
+                "Couldn't parse configuration for extension `%s` (section [%s]).\n",
                 name,
                 section);
     col->error = GNUNET_SYSERR;
-    GNUNET_PLUGIN_unload (
-      lib_name,
-      (void *) col->cfg);
     return;
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "extension library '%s' loaded\n",
-              lib_name);
 }
 
 
-static bool extensions_loaded = false;
-
 enum GNUNET_GenericReturnValue
-TALER_extensions_load (
+TALER_extensions_load_taler_config (
   const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct LoadConfClosure col = {
@@ -248,16 +224,9 @@ TALER_extensions_load (
     .error = GNUNET_OK,
   };
 
-  if (extensions_loaded)
-    return GNUNET_OK;
-
   GNUNET_CONFIGURATION_iterate_sections (cfg,
                                          &configure_extension,
                                          &col);
-
-  if (GNUNET_OK == col.error)
-    extensions_loaded = true;
-
   return col.error;
 }
 
@@ -340,16 +309,28 @@ TALER_extensions_load_json_config (
   }
 
   /* make sure to disable all extensions that weren't mentioned in the json */
-  for (const struct TALER_Extensions *it = TALER_extensions_get_head ();
+  for (const struct TALER_Extension *it = TALER_extensions_get_head ();
        NULL != it;
        it = it->next)
   {
-    if (NULL == json_object_get (extensions, it->extension->name))
+    if (NULL == json_object_get (extensions, it->name))
-      it->extension->disable ((struct TALER_Extension *) it);
+      it->disable ((struct TALER_Extension *) it);
   }
 
   return GNUNET_OK;
 }
 
 
+bool
+TALER_extensions_age_restriction_is_enabled ()
+{
+  const struct TALER_Extension *age =
+    TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
+
+  return (NULL != age &&
+          NULL != age->config_json &&
+          TALER_extensions_age_restriction_is_configured ());
+}
+
+
 /* end of extensions.c */

src/include/taler_extensions.h

@@ -24,7 +24,6 @@
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_crypto_lib.h"
 #include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
 
 
 #define TALER_EXTENSION_SECTION_PREFIX "exchange-extension-"
@@ -35,17 +34,6 @@ enum TALER_Extension_Type
   TALER_Extension_MaxPredefined = 1 // Must be last of the predefined
 };
 
-
-/*
- * @brief simply linked list of extensions
- */
-
-struct TALER_Extensions
-{
-  struct TALER_Extensions *next;
-  const struct TALER_Extension *extension;
-};
-
 /*
  * @brief Represents the implementation of an extension.
  *
@@ -53,12 +41,14 @@ struct TALER_Extensions
  */
 struct TALER_Extension
 {
+  /* simple linked list */
+  struct TALER_Extension *next;
+
   enum TALER_Extension_Type type;
   char *name;
   bool critical;
   char *version;
   void *config;
-  bool enabled;
   json_t *config_json;
 
   void (*disable)(struct TALER_Extension *ext);
@@ -73,11 +63,9 @@ struct TALER_Extension
   json_t *(*config_to_json)(
     const struct TALER_Extension *ext);
 
-  MHD_RESULT (*http_post_handler)(
+  enum GNUNET_GenericReturnValue (*load_taler_config)(
-    struct MHD_Connection *connection,
+    struct TALER_Extension *ext,
-    const json_t *root,
+    const struct GNUNET_CONFIGURATION_Handle *cfg);
-    const char *const args[]);
-
 };
 
 /**
@@ -85,15 +73,15 @@ struct TALER_Extension
  */
 
 /*
- * @brief Loads the extensions as shared libraries, as specified in the given
+ * @brief Sets the configuration of the extensions from the given TALER
- * TALER configuration.
+ * configuration.
  *
  * @param cfg Handle to the TALER configuration
  * @return GNUNET_OK on success, GNUNET_SYSERR if unknown extensions were found
  *         or any particular configuration couldn't be parsed.
  */
 enum GNUNET_GenericReturnValue
-TALER_extensions_load (
+TALER_extensions_load_taler_config (
   const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 /*
@@ -130,13 +118,25 @@ TALER_extensions_load_json_config (
 /*
  * @brief Returns the head of the linked list of extensions.
  */
-const struct TALER_Extensions *
+const struct TALER_Extension *
 TALER_extensions_get_head ();
 
+/*
+ * @brief Adds an extension to the linked list of extensions.
+ *
+ * @param new_extension the new extension to be added
+ * @return GNUNET_OK on success, GNUNET_SYSERR if the extension is invalid
+ * (missing fields), GNUNET_NO if there is already an extension with that name
+ * or type.
+ */
+enum GNUNET_GenericReturnValue
+TALER_extensions_add (
+  struct TALER_Extension *new_extension);
+
 /**
  * @brief Finds and returns a supported extension by a given type.
  *
- * @param type of the extension to lookup
+ * @param type type of the extension to lookup
  * @return extension found, or NULL (should not happen!)
  */
 const struct TALER_Extension *
@@ -154,6 +154,8 @@ const struct TALER_Extension *
 TALER_extensions_get_by_name (
   const char *name);
 
+#define TALER_extensions_is_enabled(ext) (NULL != (ext)->config)
+
 /**
  * @brief Check if a given type of an extension is enabled
  *
@@ -164,15 +166,6 @@ bool
 TALER_extensions_is_enabled_type (
   enum TALER_Extension_Type type);
 
-/**
- * @brief Check if an extension is enabled
- *
- * @param extension The extension handler.
- * @return true enabled, false if not enabled, will assert if type is not found.
- */
-bool
-TALER_extensions_is_enabled (
-  const struct TALER_Extension *extension);
 
 /*
  * Verify the signature of a given JSON object for extensions with the master
@@ -196,9 +189,6 @@ TALER_extensions_verify_json_config_signature (
 
 /*
  * TALER Age Restriction Extension
- *
- * This extension is special insofar as it directly interacts with coins and
- * denominations.
  */
 
 #define TALER_EXTENSION_SECTION_AGE_RESTRICTION (TALER_EXTENSION_SECTION_PREFIX  \
@@ -214,41 +204,98 @@ TALER_extensions_verify_json_config_signature (
                                                           | 1 << 21)
 #define TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_GROUPS "8:10:12:14:16:18:21"
 
-
+/**
-/*
+ * @brief Registers the extension for age restriction to the list extensions
- * @brief Configuration for Age Restriction
  */
-struct TALER_AgeRestrictionConfig
+enum GNUNET_GenericReturnValue
-{
+TALER_extension_age_restriction_register ();
-  bool enabled;
-  struct TALER_AgeMask mask;
-  uint8_t num_groups;
-};
-
 
 /**
- * @brief Retrieve the age restriction configuration
+ * @brief Parses a string as a list of age groups.
  *
- * @return age restriction configuration if present, otherwise NULL.
+ * The string must consist of a colon-separated list of increasing integers
+ * between 0 and 31.  Each entry represents the beginning of a new age group.
+ * F.e. the string
+ *
+ *  "8:10:12:14:16:18:21"
+ *
+ * represents the following list of eight age groups:
+ *
+ * | Group |    Ages       |
+ * | -----:|:------------- |
+ * |    0  |  0, 1, ..., 7 |
+ * |    1  |  8, 9         |
+ * |    2  | 10, 11        |
+ * |    3  | 12, 13        |
+ * |    4  | 14, 15        |
+ * |    5  | 16, 17        |
+ * |    6  | 18, 19, 20    |
+ * |    7  | 21, ...       |
+ *
+ * which is then encoded as a bit mask with the corresponding bits set:
+ *
+ *  31     24        16        8         0
+ *  |      |         |         |         |
+ *  oooooooo  oo1oo1o1  o1o1o1o1  ooooooo1
+ *
+ * @param groups String representation of age groups
+ * @param[out] mask Mask representation for age restriction.
+ * @return Error, if age groups were invalid, OK otherwise.
  */
-const struct TALER_AgeRestrictionConfig *
+enum GNUNET_GenericReturnValue
-TALER_extensions_get_age_restriction_config ();
+TALER_parse_age_group_string (
+  const char *groups,
+  struct TALER_AgeMask *mask);
 
 /**
- * @brief Check if age restriction is enabled
+ * @brief Encodes the age mask into a string, like "8:10:12:14:16:18:21"
  *
- * @return true, if age restriction is loaded, configured and enabled; otherwise false.
+ * @param mask Age mask
+ * @return String representation of the age mask, allocated by GNUNET_malloc.
+ *         Can be used as value in the TALER config.
+ */
+char *
+TALER_age_mask_to_string (
+  const struct TALER_AgeMask *mask);
+
+/**
+ * @brief Returns true when age restriction is configured and enabled.
  */
 bool
-TALER_extensions_is_age_restriction_enabled ();
+TALER_extensions_age_restriction_is_enabled ();
 
 /**
- * @brief Return the age mask for age restriction
+ * @brief Returns true when age restriction is configured (might not be
- *
+ * _enabled_, though).
- * @return configured age mask, if age restriction is loaded, configured and enabled; otherwise zero mask.
+ */
+bool
+TALER_extensions_age_restriction_is_configured ();
+
+/**
+ * @brief Returns the currently set age mask.  Note that even if age
+ * restriction is not enabled, the age mask might be have a non-zero value.
  */
 struct TALER_AgeMask
-TALER_extensions_get_age_restriction_mask ();
+TALER_extensions_age_restriction_ageMask ();
+
+
+/**
+ * @brief Returns the amount of age groups defined.  0 means no age restriction
+ * enabled.
+ */
+size_t
+TALER_extensions_age_restriction_num_groups ();
+
+/**
+ * @brief Parses a JSON object { "age_groups": "a:b:...y:z" }.
+ *
+ * @param root is the json object
+ * @param[out] mask on success, will contain the age mask
+ * @return #GNUNET_OK on success and #GNUNET_SYSERR on failure.
+ */
+enum GNUNET_GenericReturnValue
+TALER_JSON_parse_age_groups (const json_t *root,
+                             struct TALER_AgeMask *mask);
 
 
 /*

src/include/taler_util.h

@@ -492,64 +492,5 @@ char *strchrnul (const char *s, int c);
 
 #endif
 
-/**
- * @brief Parses a string as a list of age groups.
- *
- * The string must consist of a colon-separated list of increasing integers
- * between 0 and 31.  Each entry represents the beginning of a new age group.
- * F.e. the string
- *
- *  "8:10:12:14:16:18:21"
- *
- * represents the following list of eight age groups:
- *
- * | Group |    Ages       |
- * | -----:|:------------- |
- * |    0  |  0, 1, ..., 7 |
- * |    1  |  8, 9         |
- * |    2  | 10, 11        |
- * |    3  | 12, 13        |
- * |    4  | 14, 15        |
- * |    5  | 16, 17        |
- * |    6  | 18, 19, 20    |
- * |    7  | 21, ...       |
- *
- * which is then encoded as a bit mask with the corresponding bits set:
- *
- *  31     24        16        8         0
- *  |      |         |         |         |
- *  oooooooo  oo1oo1o1  o1o1o1o1  ooooooo1
- *
- * @param groups String representation of age groups
- * @param[out] mask Mask representation for age restriction.
- * @return Error, if age groups were invalid, OK otherwise.
- */
-enum GNUNET_GenericReturnValue
-TALER_parse_age_group_string (
-  const char *groups,
-  struct TALER_AgeMask *mask);
-
-/**
- * @brief Encodes the age mask into a string, like "8:10:12:14:16:18:21"
- *
- * @param mask Age mask
- * @return String representation of the age mask, allocated by GNUNET_malloc.
- *         Can be used as value in the TALER config.
- */
-char *
-TALER_age_mask_to_string (
-  const struct TALER_AgeMask *mask);
-
-/**
- * @brief Parses a JSON object { "age_groups": "a:b:...y:z" }.
- *
- * @param root is the json object
- * @param[out] mask on success, will contain the age mask
- * @return #GNUNET_OK on success and #GNUNET_SYSERR on failure.
- */
-enum GNUNET_GenericReturnValue
-TALER_JSON_parse_age_groups (const json_t *root,
-                             struct TALER_AgeMask *mask);
-
 
 #endif

src/lib/exchange_api_handle.c

@@ -902,19 +902,16 @@ decode_keys_json (const json_t *resp_obj,
   {
     struct TALER_MasterSignatureP extensions_sig = {0};
     json_t *extensions = NULL;
-    bool no_extensions = false;
-    bool no_signature = false;
-
     struct GNUNET_JSON_Specification ext_spec[] = {
       GNUNET_JSON_spec_mark_optional (
         GNUNET_JSON_spec_json ("extensions",
                                &extensions),
-        &no_extensions),
+        NULL),
       GNUNET_JSON_spec_mark_optional (
         GNUNET_JSON_spec_fixed_auto (
           "extensions_sig",
           &extensions_sig),
-        &no_signature),
+        NULL),
       GNUNET_JSON_spec_end ()
     };
 
@@ -924,12 +921,7 @@ decode_keys_json (const json_t *resp_obj,
                                ext_spec,
                                NULL, NULL));
 
-
+    if (NULL != extensions)
-    if (! no_extensions && no_signature)
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "found extensions without signature\n");
-
-    if (! no_extensions && ! no_signature)
     {
       /* 2. We have an extensions object. Verify its signature. */
       EXITIF (GNUNET_OK !=
@@ -944,7 +936,7 @@ decode_keys_json (const json_t *resp_obj,
     }
 
     /* 4. assuming we might have now a new value for age_mask, set it in key_data */
-    key_data->age_mask = TALER_extensions_get_age_restriction_mask ();
+    key_data->age_mask = TALER_extensions_age_restriction_ageMask ();
   }
 
   /**

src/testing/Makefile.am

@@ -87,7 +87,6 @@ libtalertesting_la_SOURCES = \
   testing_api_cmd_refresh.c \
   testing_api_cmd_reserve_get.c \
   testing_api_cmd_reserve_history.c \
-  testing_api_cmd_reserve_open.c \
   testing_api_cmd_reserve_purse.c \
   testing_api_cmd_reserve_status.c \
   testing_api_cmd_revoke.c \

src/testing/test_exchange_api.c

@@ -1315,6 +1315,9 @@ main (int argc,
                     "INFO",
                     NULL);
 
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_extension_age_restriction_register ());
+
   cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
   GNUNET_assert (NULL != cipher);
   uses_cs = (0 == strcmp (cipher, "cs"));

src/testing/test_exchange_p2p.c

@@ -417,6 +417,9 @@ main (int argc,
                     "INFO",
                     NULL);
 
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_extension_age_restriction_register ());
+
   cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
   GNUNET_assert (NULL != cipher);
   uses_cs = (0 == strcmp (cipher, "cs"));

src/testing/testing_api_cmd_batch_withdraw.c

@@ -490,7 +490,7 @@ TALER_TESTING_cmd_batch_withdraw (const char *label,
 
       acp = GNUNET_new (struct TALER_AgeCommitmentProof);
       hac = GNUNET_new (struct TALER_AgeCommitmentHash);
-      mask = TALER_extensions_get_age_restriction_mask();
+      mask = TALER_extensions_age_restriction_ageMask ();
       GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                   &seed,
                                   sizeof(seed));

src/testing/testing_api_cmd_reserve_open.c

@@ -27,24 +27,6 @@
 #include "taler_testing_lib.h"
 
 
-/**
- * Information we track per coin used to pay for opening the
- * reserve.
- */
-struct CoinDetail
-{
-  /**
-   * Name of the command and index of the coin to use.
-   */
-  const char *name;
-
-  /**
-   * Amount to charge to this coin.
-   */
-  struct TALER_Amount amount;
-};
-
-
 /**
  * State for a "open" CMD.
  */
@@ -56,21 +38,6 @@ struct OpenState
    */
   const char *reserve_reference;
 
-  /**
-   * Requested expiration time.
-   */
-  struct GNUNET_TIME_Relative req_expiration_time;
-
-  /**
-   * Requested minimum number of purses.
-   */
-  uint32_t min_purses;
-
-  /**
-   * Amount to pay for the opening from the reserve balance.
-   */
-  struct TALER_Amount reserve_pay;
-
   /**
    * Handle to the "reserve open" operation.
    */
@@ -81,16 +48,6 @@ struct OpenState
    */
   const char *expected_balance;
 
-  /**
-   * Length of the @e cd array.
-   */
-  unsigned int cpl;
-
-  /**
-   * Coin details, array of length @e cpl.
-   */
-  struct CoinDetail *cd;
-
   /**
    * Private key of the reserve being analyzed.
    */
@@ -122,10 +79,11 @@ struct OpenState
  */
 static void
 reserve_open_cb (void *cls,
-                 const struct TALER_EXCHANGE_ReserveOpenResult *rs)
+                 const struct TALER_EXCHANGE_ReserveOpen *rs)
 {
   struct OpenState *ss = cls;
   struct TALER_TESTING_Interpreter *is = ss->is;
+  struct TALER_Amount eb;
 
   ss->rsh = NULL;
   if (ss->expected_response_code != rs->hr.http_status)
@@ -164,7 +122,6 @@ open_run (void *cls,
 {
   struct OpenState *ss = cls;
   const struct TALER_TESTING_Command *create_reserve;
-  struct TALER_EXCHANGE_PurseDeposit cp[GNUNET_NZL (ss->cpl)];
 
   ss->is = is;
   create_reserve
@@ -188,79 +145,10 @@ open_run (void *cls,
   }
   GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
                                       &ss->reserve_pub.eddsa_pub);
-  for (unsigned int i = 0; i<ss->cpl; i++)
+  ss->rsh = TALER_EXCHANGE_reserves_open (is->exchange,
-  {
+                                          ss->reserve_priv,
-    struct TALER_EXCHANGE_PurseDeposit *cpi = &cp[i];
+                                          &reserve_open_cb,
-    const struct TALER_TESTING_Command *cmdi;
+                                          ss);
-    const struct TALER_AgeCommitmentProof *age_commitment_proof;
-    const struct TALER_CoinSpendPrivateKeyP *coin_priv;
-    const struct TALER_DenominationSignature *denom_sig;
-    const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
-    char *cref;
-    unsigned int cidx;
-
-    if (GNUNET_OK !=
-        TALER_TESTING_parse_coin_reference (ss->cd[i].name,
-                                            &cref,
-                                            &cidx))
-    {
-      GNUNET_break (0);
-      TALER_LOG_ERROR ("Failed to parse coin reference `%s'\n",
-                       ss->cd[i].name);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    cmdi = TALER_TESTING_interpreter_lookup_command (is,
-                                                     cref);
-    GNUNET_free (cref);
-    if (NULL == cmdi)
-    {
-      GNUNET_break (0);
-      TALER_LOG_ERROR ("Command `%s' not found\n",
-                       ss->cd[i].name);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    if ( (GNUNET_OK !=
-          TALER_TESTING_get_trait_age_commitment_proof (cmdi,
-                                                        cidx,
-                                                        &age_commitment_proof))
-         ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_coin_priv (cmdi,
-                                             cidx,
-                                             &coin_priv)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_denom_sig (cmdi,
-                                             cidx,
-                                             &denom_sig)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_denom_pub (cmdi,
-                                             cidx,
-                                             &denom_pub)) )
-    {
-      GNUNET_break (0);
-      TALER_LOG_ERROR ("Coin trait not found in `%s'\n",
-                       ss->cd[i].name);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    cpi->age_commitment_proof = age_commitment_proof;
-    cpi->coin_priv = *coin_priv;
-    cpi->denom_sig = *denom_sig;
-    cpi->amount = ss->cd[i].amount;
-    cpi->h_denom_pub = denom_pub->h_key;
-  }
-  ss->rsh = TALER_EXCHANGE_reserves_open (
-    is->exchange,
-    ss->reserve_priv,
-    &ss->reserve_pay,
-    ss->cpl,
-    cp,
-    GNUNET_TIME_relative_to_timestamp (ss->req_expiration_time),
-    ss->min_purses,
-    &reserve_open_cb,
-    ss);
 }
 
 
@@ -300,40 +188,12 @@ TALER_TESTING_cmd_reserve_open (const char *label,
                                 ...)
 {
   struct OpenState *ss;
-  va_list ap;
-  const char *name;
-  unsigned int i;
 
   GNUNET_assert (NULL != reserve_reference);
   ss = GNUNET_new (struct OpenState);
   ss->reserve_reference = reserve_reference;
-  ss->req_expiration_time = expiration_time;
+  ss->expected_balance = expected_balance;
-  ss->min_purses = min_purses;
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (reserve_pay,
-                                         &ss->reserve_pay));
   ss->expected_response_code = expected_response_code;
-  va_start (ap,
-            expected_response_code);
-  while (NULL != (name = va_arg (ap, const char *)))
-    ss->cpl++;
-  va_end (ap);
-  GNUNET_assert (0 == (ss->cpl % 2));
-  ss->cd = GNUNET_new_array (ss->cpl,
-                             struct CoinDetail);
-  i = 0;
-  va_start (ap,
-            expected_response_code);
-  while (NULL != (name = va_arg (ap, const char *)))
-  {
-    ss->cd[i].name = name;
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_string_to_amount (va_arg (ap,
-                                                   const char *),
-                                           &ss->cd[i].amount));
-    i++;
-  }
-  va_end (ap);
   {
     struct TALER_TESTING_Command cmd = {
       .cls = ss,

src/testing/testing_api_cmd_withdraw.c

@@ -590,7 +590,7 @@ TALER_TESTING_cmd_withdraw_amount (const char *label,
 
     acp = GNUNET_new (struct TALER_AgeCommitmentProof);
     hac = GNUNET_new (struct TALER_AgeCommitmentHash);
-    mask = TALER_extensions_get_age_restriction_mask();
+    mask = TALER_extensions_age_restriction_ageMask ();
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &seed,
                                 sizeof(seed));

src/testing/testing_api_helpers_exchange.c

@@ -314,13 +314,8 @@ sign_keys_for_exchange (void *cls,
   char *exchange_master_pub;
   int ret;
 
-  /* Load the extensions */
+  /* Load the age restriction mask from the configuration */
-  if (GNUNET_OK != TALER_extensions_load (cfg))
+  TALER_extensions_load_taler_config (cfg);
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "couldn't load extensions");
-    return GNUNET_SYSERR;
-  }
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
@@ -401,7 +396,6 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
         TALER_TESTING_auditor_db_reset (config_filename))
       return GNUNET_NO;
   }
-
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_parse_and_run (config_filename,
                                           &sign_keys_for_exchange,
@@ -715,10 +709,6 @@ TALER_TESTING_setup_with_exchange_cfg (
   char *base_url;
   int result;
 
-  /* Load extensions */
-  if (GNUNET_OK != TALER_extensions_load (cfg))
-    return GNUNET_SYSERR;
-
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "exchange",

src/util/Makefile.am

@@ -105,7 +105,6 @@ libtalerutil_la_SOURCES = \
 
 libtalerutil_la_LIBADD = \
   -lgnunetutil \
-  -lgnunetjson \
   -lsodium \
   -ljansson \
   $(LIBGCRYPT_LIBS) \

src/util/age_restriction.c

@@ -21,7 +21,6 @@
 #include "platform.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
-#include <gnunet/gnunet_json_lib.h>
 #include <gcrypt.h>
 
 void
@@ -437,113 +436,3 @@ TALER_age_commitment_proof_free (
     cp->commitment.keys = NULL;
   }
 }
-
-
-enum GNUNET_GenericReturnValue
-TALER_JSON_parse_age_groups (const json_t *root,
-                             struct TALER_AgeMask *mask)
-{
-  enum GNUNET_GenericReturnValue ret;
-  const char *str;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("age_groups",
-                             &str),
-    GNUNET_JSON_spec_end ()
-  };
-
-  ret = GNUNET_JSON_parse (root,
-                           spec,
-                           NULL,
-                           NULL);
-  if (GNUNET_OK == ret)
-    TALER_parse_age_group_string (str, mask);
-
-  GNUNET_JSON_parse_free (spec);
-
-  return ret;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_parse_age_group_string (
-  const char *groups,
-  struct TALER_AgeMask *mask)
-{
-
-  const char *pos = groups;
-  unsigned int prev = 0;
-  unsigned int val = 0;
-  char c;
-
-  while (*pos)
-  {
-    c = *pos++;
-    if (':' == c)
-    {
-      if (prev >= val)
-        return GNUNET_SYSERR;
-
-      mask->bits |= 1 << val;
-      prev = val;
-      val = 0;
-      continue;
-    }
-
-    if ('0'>c || '9'<c)
-      return GNUNET_SYSERR;
-
-    val = 10 * val + c - '0';
-
-    if (0>=val || 32<=val)
-      return GNUNET_SYSERR;
-  }
-
-  if (32<=val || prev>=val)
-    return GNUNET_SYSERR;
-
-  mask->bits |= (1 << val);
-  mask->bits |= 1; // mark zeroth group, too
-
-  return GNUNET_OK;
-}
-
-
-char *
-TALER_age_mask_to_string (
-  const struct TALER_AgeMask *mask)
-{
-  uint32_t bits = mask->bits;
-  unsigned int n = 0;
-  char *buf = GNUNET_malloc (32 * 3); // max characters possible
-  char *pos = buf;
-
-  if (NULL == buf)
-  {
-    return buf;
-  }
-
-  while (bits != 0)
-  {
-    bits >>= 1;
-    n++;
-    if (0 == (bits & 1))
-    {
-      continue;
-    }
-
-    if (n > 9)
-    {
-      *(pos++) = '0' + n / 10;
-    }
-    *(pos++) = '0' + n % 10;
-
-    if (0 != (bits >> 1))
-    {
-      *(pos++) = ':';
-    }
-  }
-  return buf;
-}
-
-
-/* end util/age_restriction.c */

src/util/bench_age_restriction.c

@@ -1,208 +0,0 @@
-/**
- * @file util/bench_age_restriction.c
- * @brief Measure Commit, Attest, Verify, Derive and Compare
- * @author Özgür Kesim
- *
- * compile in exchange/src/util with
- *
- * gcc benc_age_restriction.c \
- *    -lgnunetutil -lgnunetjson -lsodium -ljansson \
- *    -L/usr/lib/x86_64-linux-gnu -lmicrohttpd -ltalerutil \
- *    -I../include \
- *    -o bench_age_restriction
- *
- */
-#include "platform.h"
-#include <math.h>
-#include <gnunet/gnunet_util_lib.h>
-#include <taler/taler_util.h>
-#include <taler/taler_crypto_lib.h>
-
-static struct TALER_AgeMask
-  age_mask = { .bits = 1
-                       | 1 << 8 | 1 << 10 | 1 << 12
-                       | 1 << 14 | 1 << 16 | 1 << 18 | 1 << 21 };
-
-extern uint8_t
-get_age_group (
-  const struct TALER_AgeMask *mask,
-  uint8_t age);
-
-/**
- * Encodes the age mask into a string, like "8:10:12:14:16:18:21"
- */
-char *
-age_mask_to_string (
-  const struct TALER_AgeMask *m)
-{
-  uint32_t bits = m->bits;
-  unsigned int n = 0;
-  char *buf = GNUNET_malloc (32 * 3); // max characters possible
-  char *pos = buf;
-
-  if (NULL == buf)
-  {
-    return buf;
-  }
-
-  while (bits != 0)
-  {
-    bits >>= 1;
-    n++;
-    if (0 == (bits & 1))
-    {
-      continue;
-    }
-
-    if (n > 9)
-    {
-      *(pos++) = '0' + n / 10;
-    }
-    *(pos++) = '0' + n % 10;
-
-    if (0 != (bits >> 1))
-    {
-      *(pos++) = ':';
-    }
-  }
-  return buf;
-}
-
-
-#define ITER 2000
-
-double
-average (long *times, size_t size)
-{
-  double mean = 0.0;
-  for (int i = 0; i < size; i++)
-  {
-    mean += times[i];
-  }
-  return mean / size;
-}
-
-
-double
-stdev (long *times, size_t size)
-{
-  double mean = average (times, size);
-  double V = 0.0;
-  for (int i = 0; i < size; i++)
-  {
-    double d = times[i] - mean;
-    d *= d;
-    V += d;
-  }
-  return sqrt (V / size);
-}
-
-
-#define pr(n,t, i) printf ("%10s (%dx):\t%.2f ± %.2fµs\n", (n), i, average ( \
-                             &t[0], ITER) / 1000, stdev (&t[0], ITER) / 1000); \
-  i = 0;
-
-#define starttime clock_gettime (CLOCK_MONOTONIC, &tstart)
-#define stoptime clock_gettime (CLOCK_MONOTONIC, &tend); \
-  times[i] = ((long) tend.tv_sec * 1000 * 1000 * 1000 + tend.tv_nsec) \
-             - ((long) tstart.tv_sec * 1000 * 1000 * 1000 + tstart.tv_nsec);
-
-
-int
-main (int argc,
-      const char *const argv[])
-{
-  struct timespec tstart = {0,0}, tend = {0,0};
-  enum GNUNET_GenericReturnValue ret;
-  struct TALER_AgeCommitmentProof acp = {0};
-  uint8_t age = 21;
-  uint8_t age_group = get_age_group (&age_mask, age);
-  struct GNUNET_HashCode seed;
-  long times[ITER] = {0};
-  int i = 0;
-
-  //  commit
-  for (; i < ITER; i++)
-  {
-    starttime;
-    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
-                                &seed,
-                                sizeof(seed));
-
-    ret = TALER_age_restriction_commit (&age_mask,
-                                        age,
-                                        &seed,
-                                        &acp);
-    stoptime;
-
-  }
-  pr ("commit", times, i);
-
-  // attest
-  for (; i < ITER; i++)
-  {
-    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
-                                &seed,
-                                sizeof(seed));
-
-    ret = TALER_age_restriction_commit (&age_mask,
-                                        age,
-                                        &seed,
-                                        &acp);
-
-    starttime;
-    uint8_t min_group = get_age_group (&age_mask, 13);
-    struct TALER_AgeAttestation at = {0};
-    ret = TALER_age_commitment_attest (&acp,
-                                       13,
-                                       &at);
-    stoptime;
-  }
-  pr ("attest", times, i);
-
-  // verify
-  for (; i < ITER; i++)
-  {
-    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
-                                &seed,
-                                sizeof(seed));
-
-    ret = TALER_age_restriction_commit (&age_mask,
-                                        age,
-                                        &seed,
-                                        &acp);
-
-    uint8_t min_group = get_age_group (&age_mask, 13);
-    struct TALER_AgeAttestation at = {0};
-
-    ret = TALER_age_commitment_attest (&acp,
-                                       13,
-                                       &at);
-    starttime;
-    ret = TALER_age_commitment_verify (&acp.commitment,
-                                       13,
-                                       &at);
-    stoptime;
-  }
-  pr ("verify", times, i);
-
-  // derive
-  for (; i < ITER; i++)
-  {
-    struct TALER_AgeCommitmentProof acp2 = {0};
-    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
-                                &seed,
-                                sizeof(seed));
-    starttime;
-    TALER_age_commitment_derive (&acp,
-                                 &seed,
-                                 &acp2);
-    stoptime;
-  }
-  pr ("derive", times, i);
-
-  return 0;
-}
-
-
-/* end of tv_age_restriction.c */

src/util/do_bench_age_restriction

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-gcc bench_age_restriction.c \
-   -lgnunetutil -lgnunetjson -lsodium -ljansson \
-   -L/usr/lib/x86_64-linux-gnu -lmicrohttpd -ltalerutil -lm \
-   -I../include \
-   -o bench_age_restriction && ./bench_age_restriction
-