diff options
Diffstat (limited to 'src/exchange-tools/taler-exchange-offline.c')
| -rw-r--r-- | src/exchange-tools/taler-exchange-offline.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/exchange-tools/taler-exchange-offline.c b/src/exchange-tools/taler-exchange-offline.c index 93cf05bd..6b4bc27d 100644 --- a/src/exchange-tools/taler-exchange-offline.c +++ b/src/exchange-tools/taler-exchange-offline.c @@ -140,6 +140,7 @@ static const struct GNUNET_CONFIGURATION_Handle *kcfg; /** * Age restriction configuration */ +static bool ar_enabled = false; static struct TALER_AgeRestrictionConfig ar_config = {0}; /** @@ -2169,14 +2170,14 @@ upload_extensions (const char *exchange_url, /* 2. Verify the signature */ { - struct TALER_ExtensionConfigHashP h_config; + struct TALER_ExtensionManifestsHashP h_manifests; if (GNUNET_OK != - TALER_JSON_extensions_config_hash (extensions, &h_config)) + TALER_JSON_extensions_manifests_hash (extensions, &h_manifests)) { GNUNET_JSON_parse_free (spec); GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "couldn't hash extensions\n"); + "couldn't hash extensions' manifests\n"); global_ret = EXIT_FAILURE; test_shutdown (); return; @@ -2186,8 +2187,8 @@ upload_extensions (const char *exchange_url, load_offline_key (GNUNET_NO)) return; - if (GNUNET_OK != TALER_exchange_offline_extension_config_hash_verify ( - &h_config, + if (GNUNET_OK != TALER_exchange_offline_extension_manifests_hash_verify ( + &h_manifests, &master_pub, &sig)) { @@ -3889,7 +3890,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 (! ar_enabled) return null_mask; if (GNUNET_OK != (GNUNET_CONFIGURATION_have_value ( @@ -4263,7 +4264,7 @@ do_extensions_show (char *const *args) ret = json_object_set_new (exts, extension->name, - extension->config_to_json (extension)); + extension->manifest (extension)); GNUNET_assert (-1 != ret); } @@ -4286,7 +4287,7 @@ static void do_extensions_sign (char *const *args) { json_t *extensions = json_object (); - struct TALER_ExtensionConfigHashP h_config; + struct TALER_ExtensionManifestsHashP h_manifests; struct TALER_MasterSignatureP sig; const struct TALER_Extensions *it; bool found = false; @@ -4294,7 +4295,7 @@ do_extensions_sign (char *const *args) GNUNET_assert (NULL != extensions); for (it = TALER_extensions_get_head (); - NULL != it; + NULL != it && NULL != it->extension; it = it->next) { const struct TALER_Extension *ext = it->extension; @@ -4305,16 +4306,15 @@ do_extensions_sign (char *const *args) GNUNET_assert (0 == json_object_set_new (extensions, ext->name, - ext->config_to_json ( - ext))); + ext->manifest (ext))); } if (! found) return; if (GNUNET_OK != - TALER_JSON_extensions_config_hash (extensions, - &h_config)) + TALER_JSON_extensions_manifests_hash (extensions, + &h_manifests)) { json_decref (extensions); GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -4329,9 +4329,9 @@ do_extensions_sign (char *const *args) return; } - TALER_exchange_offline_extension_config_hash_sign (&h_config, - &master_priv, - &sig); + TALER_exchange_offline_extension_manifests_hash_sign (&h_manifests, + &master_priv, + &sig); obj = GNUNET_JSON_PACK ( GNUNET_JSON_pack_object_steal ("extensions", extensions), @@ -4339,6 +4339,10 @@ do_extensions_sign (char *const *args) "extensions_sig", &sig)); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + "DEBUG sending extensions object: '%s'\n", + json_dumps(obj, JSON_INDENT(2))); + output_operation (OP_EXTENSIONS, obj); next (args); @@ -4547,7 +4551,7 @@ run (void *cls, /* load extensions */ GNUNET_assert (GNUNET_OK == - TALER_extensions_load (kcfg)); + TALER_extensions_init (kcfg)); /* setup age restriction, if applicable */ { @@ -4557,7 +4561,7 @@ run (void *cls, (arc = TALER_extensions_get_age_restriction_config ())) { ar_config = *arc; - ar_config.enabled = true; + ar_enabled = true; } } |