1 files changed, 15 insertions, 78 deletions

diff --git a/src/reducer/anastasis_api_backup_redux.c b/src/reducer/anastasis_api_backup_redux.c
index eee1b70..fb30cbc 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -1276,69 +1276,6 @@ method_candidate (struct PolicyBuilder *pb,
 
 
 /**
- * Lookup @a salt of @a provider_url in @a state.
- *
- * @param state the state to inspect
- * @param provider_url provider to look into
- * @param[out] salt value to extract
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-lookup_salt (const json_t *state,
-             const char *provider_url,
-             struct ANASTASIS_CRYPTO_ProviderSaltP *salt)
-{
-  const json_t *aps;
-  const json_t *cfg;
-  uint32_t http_status = 0;
-  bool disabled = false;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_bool ("disabled",
-                             &disabled)),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_uint32 ("http_status",
-                               &http_status)),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("salt",
-                                   salt)),
-    GNUNET_JSON_spec_end ()
-  };
-
-  aps = json_object_get (state,
-                         "authentication_providers");
-  if (NULL == aps)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  cfg = json_object_get (aps,
-                         provider_url);
-  if (NULL == cfg)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (cfg,
-                         spec,
-                         NULL, NULL))
-  {
-    /* provider not working */
-    GNUNET_break_op (0);
-    return GNUNET_NO;
-  }
-  if (disabled)
-    return GNUNET_NO;
-  if (NULL ==
-      json_object_get (cfg,
-                       "salt"))
-    return GNUNET_NO;
-  return GNUNET_OK;
-}
-
-
-/**
  * Compare two cost lists.
  *
  * @param my cost to compare
@@ -1806,9 +1743,9 @@ done_authentication (json_t *state,
       struct ANASTASIS_CRYPTO_ProviderSaltP salt;
 
       if (GNUNET_OK !=
-          lookup_salt (state,
-                       url,
-                       &salt))
+          ANASTASIS_reducer_lookup_salt_ (state,
+                                          url,
+                                          &salt))
         continue; /* skip providers that are down */
       provider = GNUNET_JSON_PACK (
         GNUNET_JSON_pack_string ("provider_url",
@@ -1835,9 +1772,9 @@ done_authentication (json_t *state,
       url_str = json_string_value (url);
       if ( (NULL == url_str) ||
            (GNUNET_OK !=
-            lookup_salt (state,
-                         url_str,
-                         &salt)) )
+            ANASTASIS_reducer_lookup_salt_ (state,
+                                            url_str,
+                                            &salt)) )
       {
         GNUNET_break (0);
         ANASTASIS_redux_fail_ (cb,
@@ -3437,9 +3374,9 @@ share_secret (struct UploadContext *uc)
                                ispec,
                                NULL, NULL)) ||
            (GNUNET_OK !=
-            lookup_salt (uc->state,
-                         pds[i].provider_url,
-                         &pds[i].provider_salt)) )
+            ANASTASIS_reducer_lookup_salt_ (uc->state,
+                                            pds[i].provider_url,
+                                            &pds[i].provider_salt)) )
       {
         GNUNET_break (0);
         ANASTASIS_redux_fail_ (uc->cb,
@@ -3722,9 +3659,9 @@ add_truth_object (struct UploadContext *uc,
     };
 
     if (GNUNET_OK !=
-        lookup_salt (uc->state,
-                     provider_url,
-                     &salt))
+        ANASTASIS_reducer_lookup_salt_ (uc->state,
+                                        provider_url,
+                                        &salt))
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;
@@ -3891,9 +3828,9 @@ check_truth_upload (struct UploadContext *uc,
     tue->am_idx = am_idx;
     tue->policies_length = 1;
     if (GNUNET_OK !=
-        lookup_salt (uc->state,
-                     provider_url,
-                     &provider_salt))
+        ANASTASIS_reducer_lookup_salt_ (uc->state,
+                                        provider_url,
+                                        &provider_salt))
     {
       GNUNET_break (0);
       GNUNET_JSON_parse_free (spec);