[taler-anastasis] branch master updated: fix ftbfs, alas not the warnings

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 924d677  fix ftbfs, alas not the warnings
924d677 is described below

commit 924d677ca690795e212fa10b13a32399f0fe7aa2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Feb 16 00:57:35 2021 +0100

    fix ftbfs, alas not the warnings
---
 src/reducer/anastasis_api_recovery_redux.c | 15 +++++++++++++--
 src/reducer/anastasis_api_redux.c          | 18 +++++-------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/reducer/anastasis_api_recovery_redux.c 
b/src/reducer/anastasis_api_recovery_redux.c
index a1432e1..521bd32 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -903,6 +903,15 @@ policy_lookup_cb (void *cls,
 }
 
 
+static void
+delayed_abort (void *cls)
+{
+  struct ANASTASIS_Recovery *recovery = cls;
+
+  ANASTASIS_recovery_abort (recovery);
+}
+
+
 /**
  * Function to free a #RecoverSecretState.
  *
@@ -938,6 +947,7 @@ ANASTASIS_REDUX_backup_challenge_begin_ (json_t *state,
   json_t *version;
   json_t *providers;
   json_t *p_value;
+  const json_t *attributes;
   const char *p_key;
   struct RecoverSecretState *rss
     = GNUNET_new (struct RecoverSecretState);
@@ -945,14 +955,15 @@ ANASTASIS_REDUX_backup_challenge_begin_ (json_t *state,
   providers = json_object_get (state,
                                "authentication_providers");
   GNUNET_assert (NULL != providers);
+  attributes = json_object_get (arguments,
+                                "identity_attributes");
+  GNUNET_assert (NULL != attributes); /* already checked by caller */
   rss->id_data = attributes;
   version = json_object_get (arguments,
                              "version");
   if (NULL != version)
     rss->version = (unsigned int) json_integer_value (version);
   rss->challenges_length = 0;
-  redux_transition (state,
-                    ANASTASIS_RECOVERY_STATE_CHALLENGE_SELECTING);
   rss->state = json_incref (state);
   rss->cb = cb;
   rss->cb_cls = cb_cls;
diff --git a/src/reducer/anastasis_api_redux.c 
b/src/reducer/anastasis_api_redux.c
index 69f4291..144b4c1 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -1015,15 +1015,6 @@ ANASTASIS_REDUX_add_provider_to_state_ (const char *url,
 #endif
 
 
-static void
-delayed_abort (void *cls)
-{
-  struct ANASTASIS_Recovery *recovery = cls;
-
-  ANASTASIS_recovery_abort (recovery);
-}
-
-
 /**
  * DispatchHandler/Callback function which is called for a
  * "enter_user_attributes" action.
@@ -1162,10 +1153,11 @@ enter_user_attributes (json_t *state,
     else
     {
       redux_transition (state,
-                        ANASTASIS_BACKUP_STATE_CHALLENGE_SELECTING);
-      return backup_challenge_begin (state,
-                                     cb,
-                                     cb_cls);
+                        ANASTASIS_RECOVERY_STATE_CHALLENGE_SELECTING);
+      return ANASTASIS_REDUX_backup_challenge_begin_ (state,
+                                                      arguments,
+                                                      cb,
+                                                      cb_cls);
     }
   }
 }

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