[taler-anastasis] branch master updated (6237f82 -> 5ee4f22)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a change to branch master
in repository anastasis.

    from 6237f82  last uuid fixes
     new f2cd15b  some fixes
     new e5ce180  merge
     new 5ee4f22  fixed merge issues

The 3 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:
 src/cli/Makefile.am                  |  4 ++--
 src/cli/anastasis-cli-assembler.c    | 10 ++++++++++
 src/cli/anastasis-cli-splitter.c     |  9 +++++++--
 src/include/anastasis_crypto_lib.h   |  1 -
 src/lib/anastasis.c                  | 22 ++++++++++------------
 src/lib/anastasis_api_policy_store.c |  5 -----
 src/lib/testing_cmd_policy_create.c  |  2 +-
 src/lib/testing_cmd_secret_share.c   |  2 +-
 8 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 749ce4f..e7352b5 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -13,9 +13,9 @@ endif
 anastasis_splitter_SOURCES = \
   anastasis-cli-splitter.c
 anastasis_splitter_LDADD = \
+  $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/lib/libanastasisrest.la \
   $(top_builddir)/src/lib/libanastasis.la \
-  $(top_builddir)/src/util/libanastasisutil.la \
   -ltalermerchant \
   -ltalerjson \
   -ltalerutil \
@@ -30,9 +30,9 @@ anastasis_splitter_LDADD = \
 anastasis_assembler_SOURCES = \
   anastasis-cli-assembler.c
 anastasis_assembler_LDADD = \
+  $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/lib/libanastasisrest.la \
   $(top_builddir)/src/lib/libanastasis.la \
-  $(top_builddir)/src/util/libanastasisutil.la \
   -ltalermerchant \
   -ltalerjson \
   -ltalerutil \
diff --git a/src/cli/anastasis-cli-assembler.c 
b/src/cli/anastasis-cli-assembler.c
index 111ed65..ebb0ac6 100644
--- a/src/cli/anastasis-cli-assembler.c
+++ b/src/cli/anastasis-cli-assembler.c
@@ -744,11 +744,21 @@ shutdown_task (void *cls)
               "Shutdown initiated\n");
 
   // FIXME shutdown routine here
+  if (NULL != keyboard_task)
+  {
+    GNUNET_SCHEDULER_cancel (keyboard_task);
+    keyboard_task = NULL;
+  }
   if (NULL != ctx)
   {
     GNUNET_CURL_fini (ctx);
     ctx = NULL;
   }
+  if (NULL != rc)
+  {
+    GNUNET_CURL_gnunet_rc_destroy (rc);
+    rc = NULL;
+  }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Shutdown complete\n");
diff --git a/src/cli/anastasis-cli-splitter.c b/src/cli/anastasis-cli-splitter.c
index bcd889c..0d5acb0 100644
--- a/src/cli/anastasis-cli-splitter.c
+++ b/src/cli/anastasis-cli-splitter.c
@@ -494,6 +494,7 @@ secret_share_result_cb (void *cls,
     }
   }
   printf ("Thank you for using Anastasis\n");
+  GNUNET_free (sss->core_secret);
   keyboard_task = NULL;
   start_read_keyboard ();
   return;
@@ -850,6 +851,9 @@ read_keyboard_command (void *cls)
       char *truth_details = &buffer[strlen ("truth add ")];
       char *token = strtok (truth_details, " ");
       int server_num;
+      tus->secret_question = NULL;
+      tus->secret_answer = NULL;
+      tus->instructions = NULL;
 
       if (0 == strncmp ("server#",
                         token,
@@ -1249,8 +1253,6 @@ shutdown_task (void *cls)
     {
       GNUNET_free (tu_states[i].truth);
       GNUNET_free (tu_states[i].method);
-      GNUNET_free (tu_states[i].instructions);
-      GNUNET_free_non_null (tu_states[i].secret_question);
       GNUNET_free_non_null (tu_states[i].secret_answer);
     }
   }
@@ -1263,6 +1265,9 @@ shutdown_task (void *cls)
       GNUNET_free (servers[i].backend_methods);
     }
   }
+  GNUNET_free_non_null (servers);
+
+  GNUNET_free_non_null (pds);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Shutdown complete\n");
diff --git a/src/include/anastasis_crypto_lib.h 
b/src/include/anastasis_crypto_lib.h
index ee3651c..a26c010 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -192,7 +192,6 @@ ANASTASIS_CRYPTO_user_identifier_derive (
  * The private key is used to sign the upload.
  * @param nonce is the seed to create and recreate the private key
  * @param pub_key[out] handle for the generated pub key
- * @param priv_key[out] handle for the generated priv key
  */
 void
 ANASTASIS_CRYPTO_truth_public_key_derive (
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index 8e947cb..67b362d 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -340,7 +340,6 @@ keyshare_lookup_cb (void *cls,
                 TALER_b2s (core_secret,
                            core_secret_size),
                 (unsigned long long) core_secret_size);
-
     c->recovery->csc (c->recovery->csc_cls,
                       core_secret,
                       core_secret_size);
@@ -411,7 +410,6 @@ void
 ANASTASIS_get_challenge (struct ANASTASIS_Challenge *challenge,
                          ANASTASIS_ChallengeCallback cc)
 {
-  // FIXME
   struct ANASTASIS_ChallengeInformation *ci;
   ci = GNUNET_new (struct ANASTASIS_ChallengeInformation);
   challenge->cc = cc;
@@ -441,7 +439,7 @@ ANASTASIS_challenge_select_to_pay (struct 
ANASTASIS_Challenge *challenge,
                                    ANASTASIS_ChallengePaymentCallback cc,
                                    void *cc_cls)
 {
-
+  // FIXME
 }
 
 
@@ -490,7 +488,7 @@ policy_lookup_cb (void *cls,
   }
   void *plaintext;
   size_t size_plaintext;
-  const json_t *recovery_document;
+  json_t *recovery_document;
   json_error_t json_error;
   json_t *dec_policies;
   json_t *esc_methods;
@@ -531,10 +529,12 @@ policy_lookup_cb (void *cls,
                          NULL, NULL))
   {
     GNUNET_break_op (0);
+    json_decref (recovery_document);
+    GNUNET_JSON_parse_free (spec);
     ANASTASIS_recovery_abort (r);
     return;
   }
-
+  json_decref (recovery_document);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Decryption Policies after unpack  %s\n",
               json_dumps (dec_policies, JSON_COMPACT | JSON_SORT_KEYS));
@@ -587,6 +587,7 @@ policy_lookup_cb (void *cls,
                            NULL, NULL))
     {
       GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
       ANASTASIS_recovery_abort (r);
       return;
     }
@@ -638,6 +639,7 @@ policy_lookup_cb (void *cls,
                            NULL, NULL))
     {
       GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
       ANASTASIS_recovery_abort (r);
       return;
     }
@@ -675,6 +677,7 @@ policy_lookup_cb (void *cls,
   }
   r->solved_challenge_pos = 0;
   r->ri->cs = cs;
+
   // SETUP POLICY CALLBACK
   if (NULL != r->pc)
   {
@@ -1835,9 +1838,6 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
         index_pss++;
       }
     }
-    /* FIXME free NONCES and truths
-    GNUNET_free (policy->truths);
-    */
   }
 
   recovery_document = json_pack (
@@ -1859,7 +1859,7 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
                                       JSON_COMPACT | JSON_SORT_KEYS);
   recovery_document_size = strlen (recovery_document_str);
   GNUNET_assert (NULL != recovery_document_str);
-
+  json_decref (recovery_document);
 
   for (unsigned int l = 0; l < ss->pss_length; l++)
   {
@@ -1868,6 +1868,7 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
     ANASTASIS_CRYPTO_user_identifier_derive (id_data,
                                              ss->pss[l]->server_salt,
                                              &ss->pss[l]->id);
+    json_decref ((json_t *) id_data);
 
     ANASTASIS_CRYPTO_account_private_key_derive (&ss->pss[l]->id,
                                                  &ss->pss[l]->anastasis_priv);
@@ -1902,9 +1903,6 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
                                               &policy_store_cb,
                                               ss->pss[l]);
     GNUNET_assert (NULL != ss->pss[l]->pso);
-
-    // current_etags[l] = ss->pss[l]->curr_hash;
-    // ecs[l] = ss->pss[l]->ec;
   }
 
   // FIXME: clean up PSS, TRUTHS etc. !!!
diff --git a/src/lib/anastasis_api_policy_store.c 
b/src/lib/anastasis_api_policy_store.c
index 5d7e9a4..5f2465c 100644
--- a/src/lib/anastasis_api_policy_store.c
+++ b/src/lib/anastasis_api_policy_store.c
@@ -292,11 +292,6 @@ ANASTASIS_policy_store (struct GNUNET_CURL_Context *ctx,
     .purpose.size = htonl (sizeof (usp))
   };
 
-  /* FIXME: Maybe can be deleted
-  if (NULL != prev_recovery_data_hash)
-    usp.old_recovery_data_hash = *prev_recovery_data_hash;
-  */
-
   GNUNET_CRYPTO_hash (recovery_data,
                       recovery_data_size,
                       &usp.new_recovery_data_hash);
diff --git a/src/lib/testing_cmd_policy_create.c 
b/src/lib/testing_cmd_policy_create.c
index d80f087..d1086e7 100644
--- a/src/lib/testing_cmd_policy_create.c
+++ b/src/lib/testing_cmd_policy_create.c
@@ -139,9 +139,9 @@ static void
 policy_create_cleanup (void *cls,
                        const struct TALER_TESTING_Command *cmd)
 {
-  // FIXME: Cleanup logic
   struct PolicyCreateState *pcs = cls;
 
+  GNUNET_free_non_null (pcs->cmd_label_array);
   GNUNET_free (pcs);
 }
 
diff --git a/src/lib/testing_cmd_secret_share.c 
b/src/lib/testing_cmd_secret_share.c
index 4b8068c..1304cee 100644
--- a/src/lib/testing_cmd_secret_share.c
+++ b/src/lib/testing_cmd_secret_share.c
@@ -367,9 +367,9 @@ static void
 secret_share_cleanup (void *cls,
                       const struct TALER_TESTING_Command *cmd)
 {
-  // FIXME: Cleanup logic
   struct SecretShareState *sss = cls;
 
+  GNUNET_free_non_null (sss->cmd_label_array);
   GNUNET_free (sss);
 }
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.