[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[frosix] branch master updated (a288439 -> 814c04f)
|
From: |
gnunet |
|
Subject: |
[frosix] branch master updated (a288439 -> 814c04f) |
|
Date: |
Sat, 01 Jul 2023 11:33:08 +0200 |
This is an automated email from the git hooks/post-receive script.
joel-urech pushed a change to branch master
in repository frosix.
from a288439 initial commit
new 7bc0be0 fill .gitignore
new e367b7a rename frosix-reducer to frosix-cli
new 77cb58a remove liability limit
new 814c04f fix clean up, double free and errors in keygen
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 34 +++
src/backend/frosix-httpd.c | 16 +-
src/backend/frosix-httpd_config.c | 2 -
src/backend/frosix.conf | 19 +-
src/cli/Makefile.am | 8 +-
src/cli/{frosix-cli-redux.c => frosix-cli.c} | 12 +-
src/cli/test-frosix.sh | 6 +-
src/libfrosix/frosix_api_keygen.c | 293 ++++++++++++++++++---
src/libfrosix/frosix_api_sign.c | 6 +-
src/restclient/frosix_api_config.c | 2 -
src/restclient/frosix_api_dkg-commitment_request.c | 8 +-
11 files changed, 309 insertions(+), 97 deletions(-)
create mode 100644 .gitignore
rename src/cli/{frosix-cli-redux.c => frosix-cli.c} (98%)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..585aa4e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,34 @@
+*~
+Makefile
+Makefile.in
+aclocal.m4
+compile
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+frosix_config.h
+frosix_config.h.in
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+test-driver
+uncrustify.cfg
+*.lo
+*.o
+*.la
+autom4te.cache/
+m4/*.m4
+**/.deps/
+**/.libs/
+**/*.log
+**/*.trs
+frosix-cli
+frosix-httpd
+frosix-dbinit
+frosix-config
+test_frost
\ No newline at end of file
diff --git a/src/backend/frosix-httpd.c b/src/backend/frosix-httpd.c
index c2de62a..525578d 100644
--- a/src/backend/frosix-httpd.c
+++ b/src/backend/frosix-httpd.c
@@ -49,7 +49,7 @@ struct TALER_Amount FH_signature_creation_fee;
/**
* Amount of insurance.
*/
-struct TALER_Amount FH_insurance;
+// struct TALER_Amount FH_insurance;
/**
* Cost for secure question truth download.
@@ -852,18 +852,6 @@ run (void *cls,
global_result = GNUNET_SYSERR;
GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
NULL);
- if (GNUNET_OK !=
- TALER_config_get_amount (config,
- "frosix",
- "INSURANCE",
- &FH_insurance))
- {
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "frosix",
- "INSURANCE");
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
if (GNUNET_OK !=
TALER_config_get_amount (config,
"authorization-question",
@@ -1097,7 +1085,7 @@ run (void *cls,
db->connect (db->cls))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Database not setup. Did you run anastasis-dbinit?\n");
+ "Database not setup. Did you run frosix-dbinit?\n");
GNUNET_SCHEDULER_shutdown ();
return;
}
diff --git a/src/backend/frosix-httpd_config.c
b/src/backend/frosix-httpd_config.c
index 4e34243..eb2d8fc 100644
--- a/src/backend/frosix-httpd_config.c
+++ b/src/backend/frosix-httpd_config.c
@@ -113,8 +113,6 @@ FH_handler_config (struct FH_RequestHandler *rh,
&FH_annual_fee),
TALER_JSON_pack_amount ("signature_creation_fee",
&FH_signature_creation_fee),
- TALER_JSON_pack_amount ("liability_limit",
- &FH_insurance),
GNUNET_JSON_pack_data_auto ("provider_salt",
&FH_provider_salt),
GNUNET_JSON_pack_data_auto ("public_key",
diff --git a/src/backend/frosix.conf b/src/backend/frosix.conf
index 3d1b4f7..c7c0ffd 100644
--- a/src/backend/frosix.conf
+++ b/src/backend/frosix.conf
@@ -26,28 +26,16 @@ UNIXPATH_MODE = 660
# Which database backend do we use?
DB = postgres
-# Display name of the business running this anastasis provider.
-BUSINESS_NAME = FROSIX
+# Display name of the business running this Frosix provider.
+BUSINESS_NAME = Frosix
# Annual fee for an account
ANNUAL_FEE = TESTKUDOS:0.1
-# Number of policy uploads included in one annual fee payment
-#ANNUAL_POLICY_UPLOAD_LIMIT = 64
-
-# Insurance
-INSURANCE = TESTKUDOS:1.0
-
-# Fee for one upload.
-#TRUTH_UPLOAD_FEE = TESTKUDOS:0.1
-
# Fee for the creation of one signature
SIGNATURE_CREATION_FEE = TESTKUDOS:0.1
-# Upload limit per backup, in megabytes
-#UPLOAD_LIMIT_MB = 16
-
-# Fulfillment URL of the ANASTASIS service itself.
+# Fulfillment URL of the Frosix service itself.
FULFILLMENT_URL = taler://fulfillment-success
# Server salt 16 Byte
@@ -65,7 +53,6 @@ TERMS_DIR = ${DATADIR}tos/
# Etag / filename for the terms of service.
TERMS_ETAG = 0
-
# Directory with our privacy policy.
PRIVACY_DIR = ${DATADIR}pp/
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d1692cd..436fd09 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -2,7 +2,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/libfrosix
bin_PROGRAMS = \
- frosix-reducer
+ frosix-cli
check_SCRIPTS = \
test-frosix.sh
@@ -12,9 +12,9 @@ AM_TESTS_ENVIRONMENT=export
FROSIX_PREFIX=$${FROSIX_PREFIX:-@libdir@};export PAT
TESTS = \
$(check_SCRIPTS)
-frosix_reducer_SOURCES = \
- frosix-cli-redux.c
-frosix_reducer_LDADD = \
+frosix_cli_SOURCES = \
+ frosix-cli.c
+frosix_cli_LDADD = \
$(top_builddir)/src/util/libfrosixutil.la \
$(top_builddir)/src/libfrosix/libfrosix.la \
$(top_builddir)/src/restclient/libfrosixrest.la \
diff --git a/src/cli/frosix-cli-redux.c b/src/cli/frosix-cli.c
similarity index 98%
rename from src/cli/frosix-cli-redux.c
rename to src/cli/frosix-cli.c
index bbc1625..2f7663e 100644
--- a/src/cli/frosix-cli-redux.c
+++ b/src/cli/frosix-cli.c
@@ -14,8 +14,8 @@
Frosix; see the file COPYING.GPL. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file cli/frosix-cli-redux.c
- * @brief command line tool for our reducer
+ * @file cli/frosix-cli.c
+ * @brief command line tool for Frosix client
* @author Christian Grothoff
* @author Dennis Neufeld
* @author Dominik Meister
@@ -37,7 +37,7 @@
static struct GNUNET_CURL_RescheduleContext *rc;
/**
- * Curl context for communication with anastasis backend
+ * Curl context for communication with Frosix backend
*/
static struct GNUNET_CURL_Context *ctx;
@@ -57,7 +57,7 @@ static char *output_filename = NULL;
static char *message = NULL;
/**
- * JSON containing arguments for action
+ * JSON containing additional arguments
*/
static json_t *arguments;
@@ -163,7 +163,7 @@ action_cb (void *cls,
json_t *result_state)
{
(void) cls;
- ra = NULL;
+ // ra = NULL;
if (NULL != result_state)
persist_new_state (result_state,
@@ -552,7 +552,7 @@ main (int argc,
GNUNET_OS_init (FROSIX_project_data_default ());
ret = GNUNET_PROGRAM_run (argc,
argv,
- "frosix-reducer",
+ "frosix-cli",
"This is an application for using Frosix.\n",
options,
&run,
diff --git a/src/cli/test-frosix.sh b/src/cli/test-frosix.sh
index 5d71aaf..b6edb5b 100755
--- a/src/cli/test-frosix.sh
+++ b/src/cli/test-frosix.sh
@@ -128,7 +128,7 @@ echo " OK"
# Start with key generation
echo -n "Start distributed key generation ..."
-frosix-reducer keygen -o "${SIGN_DOCUMENT}" < "${PLIST}"
+frosix-cli keygen -o "${SIGN_DOCUMENT}" < "${PLIST}"
RET_KG=$?
if [ "$RET_KG" != "0" ]
@@ -140,7 +140,7 @@ echo " OK"
# Sign a message
echo -n "Sign a message ..."
-frosix-reducer sign -a "${AUTH}" -m "${MSG}" -o "${SIGNATURE}" <
"${SIGN_DOCUMENT}"
+frosix-cli sign -a "${AUTH}" -m "${MSG}" -o "${SIGNATURE}" < "${SIGN_DOCUMENT}"
RET_S=$?
if [ "$RET_S" != "0" ]
@@ -152,7 +152,7 @@ echo " OK"
# Verify the signature
echo -n "Verify the signature ..."
-frosix-reducer verify -m "${MSG}" < "${SIGNATURE}"
+frosix-cli verify -m "${MSG}" < "${SIGNATURE}"
RET_V=$?
if [ "$RET_V" != "0" ]
diff --git a/src/libfrosix/frosix_api_keygen.c
b/src/libfrosix/frosix_api_keygen.c
index 8b23f89..15202e3 100644
--- a/src/libfrosix/frosix_api_keygen.c
+++ b/src/libfrosix/frosix_api_keygen.c
@@ -279,8 +279,6 @@ free_dkg_data_struct (struct FROSIX_DkgData *dd)
if (NULL != dd->providers_public_keys)
GNUNET_free (dd->providers_public_keys);
-
- GNUNET_free (dd);
}
@@ -297,7 +295,10 @@ keygen_cancel_cb (void *cls)
/* free dkg data */
if (NULL != ds->dkg_data)
+ {
free_dkg_data_struct (ds->dkg_data);
+ GNUNET_free (ds->dkg_data);
+ }
/* free operations */
if (NULL != ds->co)
@@ -404,8 +405,21 @@ keygen_prepare_result (struct FROSIX_DkgState *ds)
/* check if every reported public key is the same */
for (unsigned int i = 0; i < ds->dkg_data->num_of_participants; i++)
{
- GNUNET_assert (FROST_point_cmp (&ds->dkg_data->providers[i].public_key.pk,
-
&ds->dkg_data->providers[0].public_key.pk));
+ if (GNUNET_OK != FROST_point_cmp (
+ &ds->dkg_data->providers[i].public_key.pk,
+ &ds->dkg_data->providers[0].public_key.pk))
+ {
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Public keys do not match"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
}
/* calculate encryption keys */
@@ -458,7 +472,6 @@ keygen_prepare_result (struct FROSIX_DkgState *ds)
provider));
}
-
result = GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("public_key",
&ds->dkg_data->providers[0].public_key),
@@ -491,13 +504,33 @@ dkg_key_request_cb (void *cls,
GNUNET_assert (NULL != cls);
struct FROSIX_DkgState *ds = cls;
+ if (0 >= ds->counter)
+ {
+ /* We haven't expected this callback, thus just ignore it */
+ return;
+ }
+
+ /* check if the call was successful */
+ if (0 == dkd->http_status)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error requesting dkg key from provider"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
+
/* set error code */
ds->error_code = dkd->ec;
- /* check if this is a valid callback */
- GNUNET_assert (0 < ds->counter);
- GNUNET_assert (0 != dkd->http_status);
-
/* check if provider index is valid */
GNUNET_assert (0 < dkd->provider_index);
GNUNET_assert (ds->dkg_data->num_of_participants >= dkd->provider_index);
@@ -547,11 +580,24 @@ start_dkg_key (struct FROSIX_DkgState *ds)
{
if (j < i)
{
- GNUNET_assert (dp->provider_index ==
- dd->providers[j].secret_shares[i - 1].target);
+ /* check if target of the secret share matches */
+ if (dp->provider_index != dd->providers[j].secret_shares[i - 1].target)
+ {
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error while assigning the secret
shares"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
+
secret_shares[j].identifier =
dd->providers[j].secret_shares[i - 1].issuer;
- // FIXME: memory problem?
+
memcpy (&secret_shares[j].secret_share,
&dd->providers[j].secret_shares[i - 1].encrypted_share,
sizeof (dd->providers[j].secret_shares[i -
1].encrypted_share));
@@ -561,8 +607,21 @@ start_dkg_key (struct FROSIX_DkgState *ds)
}
else if (j > i)
{
- GNUNET_assert (dp->provider_index ==
- dd->providers[j].secret_shares[i].target);
+ /* check if target of the secret share matches */
+ if (dp->provider_index != dd->providers[j].secret_shares[i].target)
+ {
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error while assigning the secret
shares"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
+
secret_shares[j - 1].identifier =
dd->providers[j].secret_shares[i].issuer;
memcpy (&secret_shares[j - 1].secret_share,
@@ -620,24 +679,74 @@ dkg_share_request_cb (void *cls,
GNUNET_assert (NULL != cls);
struct FROSIX_DkgState *ds = cls;
+ if (0 >= ds->counter)
+ {
+ /* We haven't expected this callback, thus just ignore it */
+ return;
+ }
+
+ /* check if the call was successful */
+ if (0 == dsd->http_status)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error requesting dkg shares from provider"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
+
/* set error code */
ds->error_code = dsd->ec;
- /* check if this is a valid callback */
- GNUNET_assert (0 < ds->counter);
- GNUNET_assert (0 != dsd->http_status);
-
/* check if provider index is valid */
GNUNET_assert (0 < dsd->provider_index);
GNUNET_assert (ds->dkg_data->num_of_participants >= dsd->provider_index);
/* check number of secret shares */
- GNUNET_assert (ds->dkg_data->num_of_participants - 1 == dsd->shares_len);
+ if (ds->dkg_data->num_of_participants - 1 != dsd->shares_len)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error in dkg shares response"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
/* check if our provider index is same as in the response */
for (unsigned int i = 0; i < dsd->shares_len; i++)
{
- GNUNET_assert (dsd->provider_index == dsd->shares[i].issuer);
+ if (dsd->provider_index != dsd->shares[i].issuer)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error in dkg shares response"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
}
/* copy commitment in our struct - just assign pointer */
@@ -735,23 +844,72 @@ dkg_commitment_request_cb (void *cls,
GNUNET_assert (NULL != cls);
struct FROSIX_DkgState *ds = cls;
+ if (0 >= ds->counter)
+ {
+ /* We haven't expected this callback, thus just ignore it */
+ return;
+ }
+
+ /* check if the call was successful */
+ if (0 == dcd->http_status)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error requesting dkg commitment from
provider"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
+
/* set error code */
ds->error_code = dcd->ec;
- /* check if this is a valid callback */
- GNUNET_assert (0 < ds->counter);
- GNUNET_assert (0 != dcd->http_status);
-
/* check if provider index is valid */
GNUNET_assert (0 < dcd->provider_index);
GNUNET_assert (ds->dkg_data->num_of_participants >= dcd->provider_index);
/* check if our provider index is same as in the response */
- GNUNET_assert (dcd->provider_index == dcd->dkg_commitment.identifier);
+ if (dcd->provider_index != dcd->dkg_commitment.identifier)
+ {
+ ds->counter--;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error in dkg commitment response"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
/* check if length of commitments equals our threshold value */
- GNUNET_assert (dcd->dkg_commitment.shares_commitments_length ==
- ds->dkg_data->threshold);
+ if (dcd->dkg_commitment.shares_commitments_length != ds->dkg_data->threshold)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error in dkg commitment response"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
/* copy commitment in our struct */
struct FROSIX_DkgProvider *dp = &ds->dkg_data->providers[dcd->provider_index
@@ -956,7 +1114,7 @@ start_dkg_commitments (struct FROSIX_DkgState *ds)
&client_entropy,
&provider_entropy);
- /* computer salted hash of authentication data */
+ /* compute salted hash of authentication data */
for (unsigned int i = 0; i < ds->dkg_data->num_of_participants; i++)
{
struct FROSIX_DkgProvider *dp = &ds->dkg_data->providers[i];
@@ -1030,9 +1188,29 @@ seed_request_cb (void *cls,
GNUNET_assert (NULL != cls);
struct FROSIX_DkgState *ds = cls;
- /* check if this is a valid callback */
- GNUNET_assert (0 < ds->counter);
- GNUNET_assert (0 != http_status);
+ if (0 >= ds->counter)
+ {
+ /* We haven't expected this callback, thus just ignore it */
+ return;
+ }
+
+ /* check if the call was successful */
+ if (0 == http_status)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error requesting seed from provider"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
/* check if provider index is valid */
GNUNET_assert (0 < ps->provider_index);
@@ -1064,9 +1242,8 @@ static void
start_seed_requests (struct FROSIX_DkgState *ds)
{
ds->counter = 0;
- // FIXME: pointer to array of pointers?
ds->sgo = GNUNET_malloc (ds->dkg_data->num_of_participants * sizeof (char
*));
- // FIXME: implement free of config operations
+
for (unsigned int i = 0; i < ds->dkg_data->num_of_participants; i++)
{
ds->sgo[i] = FROSIX_seed_get (FROSIX_REDUX_ctx_,
@@ -1093,9 +1270,29 @@ config_request_cb (void *cls,
GNUNET_assert (NULL != cls);
struct FROSIX_DkgState *ds = cls;
- /* check if this is a valid callback */
- GNUNET_assert (0 < ds->counter); // FIXME: abort correctly
- GNUNET_assert (0 != http_status);
+ if (0 >= ds->counter)
+ {
+ /* We haven't expected this callback, thus just ignore it */
+ return;
+ }
+
+ /* check if the call was successful */
+ if (0 == http_status)
+ {
+ ds->counter = 0;
+
+ // FIXME: cancel all other running and not yet returned requests
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error requesting config from provider"));
+
+ ds->cb (ds->cb_cls,
+ 0,
+ error_message);
+
+ return;
+ }
/* check if provider index is valid */
GNUNET_assert (0 < fcfg->provider_index);
@@ -1106,7 +1303,9 @@ config_request_cb (void *cls,
struct FROSIX_DkgProvider *dp =
&ds->dkg_data->providers[fcfg->provider_index - 1];
- dp->provider_name = strdup (fcfg->business_name);
+ size_t len = strlen (fcfg->business_name);
+ dp->provider_name = strndup (fcfg->business_name,
+ len);
memcpy (&dp->provider_salt,
&fcfg->provider_salt,
@@ -1139,7 +1338,6 @@ static void
start_config_requests (struct FROSIX_DkgState *ds)
{
ds->counter = 0;
- // FIXME: pointer to array of pointers?
ds->co = GNUNET_malloc (ds->dkg_data->num_of_participants * sizeof (char *));
for (unsigned int i = 0; i < ds->dkg_data->num_of_participants; i++)
@@ -1191,10 +1389,11 @@ parse_keygen_arguments (struct FROSIX_DkgData *dkg_data,
size_t num_of_providers = json_array_size (providers);
/* validate number of providers */
- GNUNET_assert (255 > num_of_providers);
- GNUNET_assert (1 < num_of_providers);
- GNUNET_assert (0 < dkg_data->threshold);
- GNUNET_assert (num_of_providers > dkg_data->threshold);
+ if (num_of_providers > 254
+ || num_of_providers < 2
+ || dkg_data->threshold < 1
+ || num_of_providers <= dkg_data->threshold)
+ return GNUNET_NO;
dkg_data->num_of_participants = num_of_providers;
@@ -1258,8 +1457,16 @@ FROSIX_redux_keygen_start (const json_t *arguments,
arguments))
{
free_dkg_data_struct (dkg_data);
+ GNUNET_free (dkg_data);
+ json_t *error_message;
+ error_message = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_string ("Frosix_client_error",
+ "Error while parsing input"));
+
+ cb (cb_cls,
+ 0,
+ error_message);
- // FIXME: Return some useful error message
return NULL;
}
diff --git a/src/libfrosix/frosix_api_sign.c b/src/libfrosix/frosix_api_sign.c
index cd38d92..e227fef 100644
--- a/src/libfrosix/frosix_api_sign.c
+++ b/src/libfrosix/frosix_api_sign.c
@@ -198,8 +198,6 @@ free_signature_data_struct (struct FROSIX_SignatureData *sd)
GNUNET_free (sd->providers);
}
-
- GNUNET_free (sd);
}
@@ -215,7 +213,11 @@ sign_cancel_cb (void *cls)
struct FROSIX_SignatureState *ss = cls;
if (NULL != ss->sig_data)
+ {
free_signature_data_struct (ss->sig_data);
+ GNUNET_free (ss->sig_data);
+ }
+
/* free operations */
if (NULL != ss->co)
diff --git a/src/restclient/frosix_api_config.c
b/src/restclient/frosix_api_config.c
index e9db6f3..fbcea3e 100644
--- a/src/restclient/frosix_api_config.c
+++ b/src/restclient/frosix_api_config.c
@@ -87,8 +87,6 @@ handle_config_finished (void *cls,
&fcfg.annual_fee),
TALER_JSON_spec_amount_any ("signature_creation_fee",
&fcfg.signature_creation_fee),
- TALER_JSON_spec_amount_any ("liability_limit",
- &fcfg.liability_limit),
GNUNET_JSON_spec_fixed_auto ("provider_salt",
&fcfg.provider_salt),
GNUNET_JSON_spec_fixed_auto ("public_key",
diff --git a/src/restclient/frosix_api_dkg-commitment_request.c
b/src/restclient/frosix_api_dkg-commitment_request.c
index 45bcac2..83b210b 100644
--- a/src/restclient/frosix_api_dkg-commitment_request.c
+++ b/src/restclient/frosix_api_dkg-commitment_request.c
@@ -340,17 +340,15 @@ FROSIX_dkg_commitment_request (
context_string),
GNUNET_JSON_pack_data_auto ("auth_hash",
challenge_hash),
- GNUNET_JSON_pack_array_incref ("providers_public_keys",
- json_public_keys));
+ GNUNET_JSON_pack_array_steal ("providers_public_keys",
+ json_public_keys));
json_str = json_dumps (dkg_commitment_data,
JSON_COMPACT);
- json_decref (json_public_keys);
+ json_decref (dkg_commitment_data);
/* check if we have a json object, abort if it was not successful */
GNUNET_assert (NULL != json_str);
-
- json_decref (dkg_commitment_data);
}
/* prepare curl options and fire the request */
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [frosix] branch master updated (a288439 -> 814c04f),
gnunet <=