diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-02-15 22:05:37 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-02-15 22:05:37 +0100 |
| commit | e6c5262c9ec9c6a930bff99f66eaa8f6cf509f08 (patch) | |
| tree | f8090d4d128dddbe4ea94d65863a138b1161a30e | |
| parent | c1a58ef343302bd2ded679986f637865adecc961 (diff) | |
| download | exchange-e6c5262c9ec9c6a930bff99f66eaa8f6cf509f08.tar.gz exchange-e6c5262c9ec9c6a930bff99f66eaa8f6cf509f08.tar.bz2 exchange-e6c5262c9ec9c6a930bff99f66eaa8f6cf509f08.zip | |
fix currency parsing in deserialization logic (resolves #6744)
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/libtalerexchange-dev.install | 1 | ||||
| -rw-r--r-- | src/lib/exchange_api_handle.c | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ee426bd5..554880e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +taler-exchange (0.9.0-7) unstable; urgency=medium + + * Avoid picking up libtalerexchange-dev as a dependency of taler-exchange. + + -- Christian Grothoff <grothoff@gnu.org> Mon, 15 Feb 2021 13:02:10 +0100 + taler-exchange (0.9.0-6) unstable; urgency=medium * Fixed a few memory leaks. diff --git a/debian/libtalerexchange-dev.install b/debian/libtalerexchange-dev.install index 5e8a7c19..86f2577a 100644 --- a/debian/libtalerexchange-dev.install +++ b/debian/libtalerexchange-dev.install @@ -1,3 +1,4 @@ +usr/bin/taler-exchange-benchmark usr/include/taler/* usr/lib/*/libtalertesting.so.* usr/lib/*/libtalerfakebank.so.* diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index f362bc5e..8c7cbeda 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -677,6 +677,7 @@ decode_keys_json (const json_t *resp_obj, struct TALER_ExchangeSignatureP sig; struct GNUNET_HashContext *hash_context; struct TALER_ExchangePublicKeyP pub; + const char *currency; struct GNUNET_JSON_Specification mspec[] = { GNUNET_JSON_spec_fixed_auto ("eddsa_sig", &sig), @@ -691,7 +692,7 @@ decode_keys_json (const json_t *resp_obj, TALER_JSON_spec_relative_time ("reserve_closing_delay", &key_data->reserve_closing_delay), GNUNET_JSON_spec_string ("currency", - &key_data->currency), + ¤cy), GNUNET_JSON_spec_end () }; @@ -755,6 +756,7 @@ decode_keys_json (const json_t *resp_obj, GNUNET_JSON_parse (resp_obj, (check_sig) ? mspec : &mspec[2], NULL, NULL)); + key_data->currency = GNUNET_strdup (currency); /* parse the master public key and issue date of the response */ if (check_sig) hash_context = GNUNET_CRYPTO_hash_context_start (); |