From 66f9a5b5e5431b6a24352e8ce95e30c8b00a6d92 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 10 Jul 2023 15:26:53 +0200 Subject: -simplify --- src/exchange/taler-exchange-httpd_keys.c | 3 --- src/lib/exchange_api_handle.c | 15 ++++----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c index 388a383f2..debad6f1f 100644 --- a/src/exchange/taler-exchange-httpd_keys.c +++ b/src/exchange/taler-exchange-httpd_keys.c @@ -2379,15 +2379,12 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh) json_array_append_new ( grouped_denominations, group->json)); - /* Build the running XOR over all hash(_xor) */ GNUNET_CRYPTO_hash_xor (&group->hash_xor, &grouped_hash_xor, &grouped_hash_xor); - GNUNET_free (group); } - GNUNET_CONTAINER_multihashmap_iterator_destroy (iter); } diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 528662c60..cf7f1b970 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -825,17 +825,10 @@ decode_keys_json (const json_t *resp_obj, &key_data->master_pub, check_sig ? &hash_xor : NULL)); - /* Build the running xor of the SHA512-hash of the public keys */ - { - struct TALER_DenominationHashP hc; - - TALER_denom_pub_hash (&dk.key, - &hc); - GNUNET_CRYPTO_hash_xor (&hc.hash, - &group_hash_xor, - &group_hash_xor); - } - + /* Build the running xor of the SHA512-hash of the public keys for the group */ + GNUNET_CRYPTO_hash_xor (&dk.h_key.hash, + &group_hash_xor, + &group_hash_xor); for (unsigned int j = 0; jnum_denom_keys; j++) -- cgit v1.2.3