taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-bugfixes

Browse Source
This commit is contained in:
Christian Grothoff 2023-07-04 23:21:47 +02:00
parent ff8349e6e7
commit 999db0fb80
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/exchange_api_handle.c
View File

@ -1281,6 +1281,10 @@ header_cb (char *buffer,
return total; return total;
val = GNUNET_strndup (&buffer[strlen (MHD_HTTP_HEADER_EXPIRES ": ")], val = GNUNET_strndup (&buffer[strlen (MHD_HTTP_HEADER_EXPIRES ": ")],
total - strlen (MHD_HTTP_HEADER_EXPIRES ": ")); total - strlen (MHD_HTTP_HEADER_EXPIRES ": "));
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Found %s header `%s'\n",
MHD_HTTP_HEADER_EXPIRES,
val);
if (GNUNET_OK != if (GNUNET_OK !=
parse_date_string (val, parse_date_string (val,
&kr->expire)) &kr->expire))
@ -1541,7 +1545,8 @@ TALER_EXCHANGE_keys_from_json (const json_t *j)
const json_t *jkeys; const json_t *jkeys;
const char *url; const char *url;
uint32_t version; uint32_t version;
struct GNUNET_TIME_Timestamp expire; struct GNUNET_TIME_Timestamp expire
= GNUNET_TIME_UNIT_ZERO_TS;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_uint32 ("version", GNUNET_JSON_spec_uint32 ("version",
&version), &version),
@ -1549,8 +1554,10 @@ TALER_EXCHANGE_keys_from_json (const json_t *j)
&jkeys), &jkeys),
GNUNET_JSON_spec_string ("exchange_url", GNUNET_JSON_spec_string ("exchange_url",
&url), &url),
GNUNET_JSON_spec_mark_optional (
GNUNET_JSON_spec_timestamp ("expire", GNUNET_JSON_spec_timestamp ("expire",
&expire), &expire),
NULL),
GNUNET_JSON_spec_end () GNUNET_JSON_spec_end ()
}; };
struct TALER_EXCHANGE_Keys *keys; struct TALER_EXCHANGE_Keys *keys;
@ -1747,8 +1754,9 @@ TALER_EXCHANGE_keys_to_json (const struct TALER_EXCHANGE_Keys *kd)
return GNUNET_JSON_PACK ( return GNUNET_JSON_PACK (
GNUNET_JSON_pack_uint64 ("version", GNUNET_JSON_pack_uint64 ("version",
EXCHANGE_SERIALIZATION_FORMAT_VERSION), EXCHANGE_SERIALIZATION_FORMAT_VERSION),
GNUNET_JSON_pack_allow_null (
GNUNET_JSON_pack_timestamp ("expire", GNUNET_JSON_pack_timestamp ("expire",
kd->key_data_expiration), kd->key_data_expiration)),
GNUNET_JSON_pack_string ("exchange_url", GNUNET_JSON_pack_string ("exchange_url",
kd->exchange_url), kd->exchange_url),
GNUNET_JSON_pack_object_steal ("keys", GNUNET_JSON_pack_object_steal ("keys",

1
src/testing/testing_api_cmd_check_keys.c
View File

@ -73,6 +73,7 @@ keys_cb (void *cls,
{ {
struct CheckKeysState *cks = cls; struct CheckKeysState *cks = cls;
cks->gkh = NULL;
if (MHD_HTTP_OK != kr->hr.http_status) if (MHD_HTTP_OK != kr->hr.http_status)
{ {
TALER_TESTING_unexpected_status (cks->is, TALER_TESTING_unexpected_status (cks->is,

1
src/testing/testing_api_cmd_connect_with_state.c
View File

@ -67,6 +67,7 @@ cert_cb (void *cls,
struct TALER_TESTING_Interpreter *is = cwss->is; struct TALER_TESTING_Interpreter *is = cwss->is;
const struct TALER_EXCHANGE_HttpResponse *hr = &kr->hr; const struct TALER_EXCHANGE_HttpResponse *hr = &kr->hr;
cwss->exchange = NULL;
switch (hr->http_status) switch (hr->http_status)
{ {
case MHD_HTTP_OK: case MHD_HTTP_OK: