diff --git a/src/exchange/taler-exchange-httpd_management_extensions.c b/src/exchange/taler-exchange-httpd_management_extensions.c index 96b42abb2..33bbf3525 100644 --- a/src/exchange/taler-exchange-httpd_management_extensions.c +++ b/src/exchange/taler-exchange-httpd_management_extensions.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "taler_json_lib.h" #include "taler_mhd_lib.h" #include "taler_signatures.h" @@ -269,14 +268,13 @@ TEH_handler_management_post_extensions ( struct MHD_Connection *connection, const json_t *root) { -#if 0 - json_t *denom_sigs; - json_t *signkey_sigs; + json_t *extensions; + json_t *extensions_sigs; struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_json ("denom_sigs", - &denom_sigs), - GNUNET_JSON_spec_json ("signkey_sigs", - &signkey_sigs), + GNUNET_JSON_spec_json ("extensions", + &extensions), + GNUNET_JSON_spec_json ("extensions_sigs", + &extensions_sigs), GNUNET_JSON_spec_end () }; bool ok; @@ -293,8 +291,8 @@ TEH_handler_management_post_extensions ( if (GNUNET_NO == res) return MHD_YES; /* failure */ } - if (! (json_is_array (denom_sigs) && - json_is_array (signkey_sigs)) ) + if (! (json_is_array (extensions) && + json_is_array (extensions_sigs)) ) { GNUNET_break_op (0); GNUNET_JSON_parse_free (spec); @@ -302,10 +300,11 @@ TEH_handler_management_post_extensions ( connection, MHD_HTTP_BAD_REQUEST, TALER_EC_GENERIC_PARAMETER_MALFORMED, - "array expected for denom_sigs and signkey_sigs"); + "array expected for extensions and extensions_sig"); } GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received /management/keys\n"); +#if 0 akc.nd_sigs = json_array_size (denom_sigs); akc.d_sigs = GNUNET_new_array (akc.nd_sigs, struct DenomSig); diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index af07588e1..04b731b32 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -2680,7 +2680,7 @@ TALER_EXCHANGE_post_management_keys_cancel ( struct TALER_EXCHANGE_ManagementPostExtensionsData { struct TALER_Extension *extensions; - struct TALER_MasterSignatureP *extension_sigs; + struct TALER_MasterSignatureP *extensions_sigs; uint32_t num_extensions; }; diff --git a/src/lib/exchange_api_management_post_extensions.c b/src/lib/exchange_api_management_post_extensions.c index 7f6349113..96a56eb3b 100644 --- a/src/lib/exchange_api_management_post_extensions.c +++ b/src/lib/exchange_api_management_post_extensions.c @@ -134,7 +134,7 @@ TALER_EXCHANGE_management_post_extensions ( CURL *eh = NULL; json_t *body; json_t *extensions = NULL; - json_t *extension_sigs = NULL; + json_t *extensions_sigs = NULL; ph = GNUNET_new (struct TALER_EXCHANGE_ManagementPostExtensionsHandle); ph->cb = cb; @@ -183,16 +183,16 @@ TALER_EXCHANGE_management_post_extensions ( config) ))); } - extension_sigs = json_array (); - GNUNET_assert (NULL != extension_sigs); + extensions_sigs = json_array (); + GNUNET_assert (NULL != extensions_sigs); for (unsigned int i = 0; inum_extensions; i++) { const struct TALER_MasterSignatureP *sks - = &pkd->extension_sigs[i]; + = &pkd->extensions_sigs[i]; GNUNET_assert (0 == json_array_append_new ( - extension_sigs, + extensions_sigs, GNUNET_JSON_PACK ( GNUNET_JSON_pack_data_auto ("extension_sig", &sks->eddsa_signature)))); @@ -200,8 +200,8 @@ TALER_EXCHANGE_management_post_extensions ( body = GNUNET_JSON_PACK ( GNUNET_JSON_pack_array_steal ("extensions", extensions), - GNUNET_JSON_pack_array_steal ("extension_sigs", - extension_sigs)); + GNUNET_JSON_pack_array_steal ("extensions_sigs", + extensions_sigs)); eh = curl_easy_init (); GNUNET_assert (NULL != eh); if (GNUNET_OK !=