diff options
Diffstat (limited to 'src/reducer/anastasis_api_redux.c')
-rw-r--r-- | src/reducer/anastasis_api_redux.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/reducer/anastasis_api_redux.c b/src/reducer/anastasis_api_redux.c index 58ca0fb..1dba576 100644 --- a/src/reducer/anastasis_api_redux.c +++ b/src/reducer/anastasis_api_redux.c | |||
@@ -188,9 +188,9 @@ struct ConfigRequest | |||
188 | struct TALER_Amount liability_limit; | 188 | struct TALER_Amount liability_limit; |
189 | 189 | ||
190 | /** | 190 | /** |
191 | * Server salt. | 191 | * Provider salt. |
192 | */ | 192 | */ |
193 | struct ANASTASIS_CRYPTO_ProviderSaltP salt; | 193 | struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; |
194 | 194 | ||
195 | /** | 195 | /** |
196 | * Task to timeout /config requests. | 196 | * Task to timeout /config requests. |
@@ -539,8 +539,8 @@ notify_waiting (struct ConfigRequest *cr) | |||
539 | cr->business_name), | 539 | cr->business_name), |
540 | GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes", | 540 | GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes", |
541 | cr->storage_limit_in_megabytes), | 541 | cr->storage_limit_in_megabytes), |
542 | GNUNET_JSON_pack_data_auto ("salt", | 542 | GNUNET_JSON_pack_data_auto ("provider_salt", |
543 | &cr->salt), | 543 | &cr->provider_salt), |
544 | GNUNET_JSON_pack_uint64 ("http_status", | 544 | GNUNET_JSON_pack_uint64 ("http_status", |
545 | cr->http_status)); | 545 | cr->http_status)); |
546 | } | 546 | } |
@@ -617,7 +617,7 @@ config_cb (void *cls, | |||
617 | cr->annual_fee = acfg->annual_fee; | 617 | cr->annual_fee = acfg->annual_fee; |
618 | cr->truth_upload_fee = acfg->truth_upload_fee; | 618 | cr->truth_upload_fee = acfg->truth_upload_fee; |
619 | cr->liability_limit = acfg->liability_limit; | 619 | cr->liability_limit = acfg->liability_limit; |
620 | cr->salt = acfg->salt; | 620 | cr->provider_salt = acfg->provider_salt; |
621 | } | 621 | } |
622 | } | 622 | } |
623 | notify_waiting (cr); | 623 | notify_waiting (cr); |
@@ -2013,17 +2013,18 @@ ANASTASIS_REDUX_load_continents_ () | |||
2013 | 2013 | ||
2014 | 2014 | ||
2015 | /** | 2015 | /** |
2016 | * Lookup @a salt of @a provider_url in @a state. | 2016 | * Lookup @a provider_salt of @a provider_url in @a state. |
2017 | * | 2017 | * |
2018 | * @param state the state to inspect | 2018 | * @param state the state to inspect |
2019 | * @param provider_url provider to look into | 2019 | * @param provider_url provider to look into |
2020 | * @param[out] salt value to extract | 2020 | * @param[out] provider_salt value to extract |
2021 | * @return #GNUNET_OK on success | 2021 | * @return #GNUNET_OK on success |
2022 | */ | 2022 | */ |
2023 | enum GNUNET_GenericReturnValue | 2023 | enum GNUNET_GenericReturnValue |
2024 | ANASTASIS_reducer_lookup_salt (const json_t *state, | 2024 | ANASTASIS_reducer_lookup_salt ( |
2025 | const char *provider_url, | 2025 | const json_t *state, |
2026 | struct ANASTASIS_CRYPTO_ProviderSaltP *salt) | 2026 | const char *provider_url, |
2027 | struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt) | ||
2027 | { | 2028 | { |
2028 | const json_t *aps; | 2029 | const json_t *aps; |
2029 | const json_t *cfg; | 2030 | const json_t *cfg; |
@@ -2040,8 +2041,8 @@ ANASTASIS_reducer_lookup_salt (const json_t *state, | |||
2040 | &http_status), | 2041 | &http_status), |
2041 | NULL), | 2042 | NULL), |
2042 | GNUNET_JSON_spec_mark_optional ( | 2043 | GNUNET_JSON_spec_mark_optional ( |
2043 | GNUNET_JSON_spec_fixed_auto ("salt", | 2044 | GNUNET_JSON_spec_fixed_auto ("provider_salt", |
2044 | salt), | 2045 | provider_salt), |
2045 | &no_salt), | 2046 | &no_salt), |
2046 | GNUNET_JSON_spec_end () | 2047 | GNUNET_JSON_spec_end () |
2047 | }; | 2048 | }; |