-fix ftbfs

3 files changed, 38 insertions, 38 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation.h b/src/experimentation/gnunet-daemon-experimentation.h
index 86e41a114..9568cfa33 100644
--- a/src/experimentation/gnunet-daemon-experimentation.h
+++ b/src/experimentation/gnunet-daemon-experimentation.h
@@ -93,7 +93,7 @@ struct Experiment
   /**
    * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
 
   /**
    * Experiment version as timestamp of creation
@@ -178,7 +178,7 @@ struct Node
   /**
    * Array of issuers accepted by this neighbor.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey *issuer_id;
+  struct GNUNET_CRYPTO_EddsaPublicKey *issuer_id;
 
   unsigned int issuer_count;
 
@@ -192,7 +192,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * Used to detect experimentation capability
  *
  * This struct is followed by issuer identities:
- * (issuer_count * struct GNUNET_CRYPTO_EccPublicSignKey)
+ * (issuer_count * struct GNUNET_CRYPTO_EddsaPublicKey)
  *
  */
 struct Experimentation_Request
@@ -210,7 +210,7 @@ struct Experimentation_Request
  * Sent if peer is running the daemon
  *
  * This struct is followed by issuer identities:
- * (issuer_count * struct GNUNET_CRYPTO_EccPublicSignKey)
+ * (issuer_count * struct GNUNET_CRYPTO_EddsaPublicKey)
  */
 struct Experimentation_Response
 {
@@ -227,7 +227,7 @@ struct Experimentation_Response
  */
 struct Issuer
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
+  struct GNUNET_CRYPTO_EddsaPublicKey pubkey;
 };
 
 
@@ -255,7 +255,7 @@ struct GED_start_message
   /**
    * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
 
   /**
    * Experiment version as timestamp of creation
@@ -276,7 +276,7 @@ struct GED_start_ack_message
   /**
    * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
 
   /**
    * Experiment version as timestamp of creation
@@ -297,7 +297,7 @@ struct GED_stop_message
   /**
    * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
 
   /**
    * Experiment version as timestamp of creation
@@ -379,7 +379,7 @@ GED_capabilities_stop (void);
  * @return #GNUNET_YES or #GNUNET_NO
  */
 int
-GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer_ID);
+GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer_ID);
 
 
 /*
@@ -391,7 +391,7 @@ GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EccPublicSignKey *is
  * @return the experiment or NULL if not found
  */
 struct Experiment *
-GED_experiments_find (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+GED_experiments_find (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                       const char *name,
                       const struct GNUNET_TIME_Absolute version);
 
@@ -402,7 +402,7 @@ typedef void (*GNUNET_EXPERIMENTATION_experiments_get_cb) (struct Node *n,
 
 void
 GED_experiments_get (struct Node *n,
-                     struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+                     struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                      GNUNET_EXPERIMENTATION_experiments_get_cb get_cb);
 
 
diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index 7d2bb181a..471a7bfdc 100644
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -105,11 +105,11 @@ free_issuer (void *cls,
  * @return #GNUNET_YES or #GNUNET_NO
  */
 int
-GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer_id)
+GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer_id)
 {
   struct GNUNET_HashCode hash;
 
-  GNUNET_CRYPTO_hash (issuer_id, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), &hash);
+  GNUNET_CRYPTO_hash (issuer_id, sizeof (struct GNUNET_CRYPTO_EddsaPublicKey), &hash);
   if (GNUNET_CONTAINER_multihashmap_contains (valid_issuers, &hash))
     return GNUNET_YES;
   return GNUNET_NO;
@@ -121,14 +121,14 @@ GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EccPublicSignKey *is
  * experiment map.
  */
 static void
-get_experiment_key (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+get_experiment_key (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                     const char *name,
                     const struct GNUNET_TIME_Absolute version,
                     struct GNUNET_HashCode *key)
 {
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CRYPTO_kdf (key, sizeof (struct GNUNET_HashCode),
-                                    issuer, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
+                                    issuer, sizeof (struct GNUNET_CRYPTO_EddsaPublicKey),
                                     name, strlen (name),
                                     &version, sizeof (version),
                                     NULL, 0));
@@ -144,7 +144,7 @@ get_experiment_key (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
  * @return the experiment or NULL if not found
  */
 struct Experiment *
-GED_experiments_find (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+GED_experiments_find (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                       const char *name,
                       const struct GNUNET_TIME_Absolute version)
 {
@@ -165,7 +165,7 @@ struct GetCtx
 
   GNUNET_EXPERIMENTATION_experiments_get_cb get_cb;
 
-  struct GNUNET_CRYPTO_EccPublicSignKey *issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey *issuer;
 };
 
 
@@ -179,7 +179,7 @@ get_it (void *cls,
 
   if (0 == memcmp (&e->issuer,
                    get_ctx->issuer,
-                   sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)))
+                   sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)))
     get_ctx->get_cb (get_ctx->n, e);
   return GNUNET_OK;
 }
@@ -187,7 +187,7 @@ get_it (void *cls,
 
 void
 GED_experiments_get (struct Node *n,
-                     struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+                     struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                      GNUNET_EXPERIMENTATION_experiments_get_cb get_cb)
 {
   struct GetCtx get_ctx;
@@ -210,7 +210,7 @@ GED_experiments_get (struct Node *n,
 int
 GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
                                         const char *name,
-                                        const struct GNUNET_CRYPTO_EccPublicSignKey *issuer_id,
+                                        const struct GNUNET_CRYPTO_EddsaPublicKey *issuer_id,
                                         struct GNUNET_TIME_Absolute version,
                                         char *description,
                                         uint32_t required_capabilities,
@@ -284,7 +284,7 @@ exp_file_iterator (void *cls,
   char *val;
   unsigned long long number;
   /* Experiment values */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
   struct GNUNET_TIME_Absolute version;
   char *description;
   uint32_t required_capabilities;
@@ -304,7 +304,7 @@ exp_file_iterator (void *cls,
     return;
   }
   if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_ecc_public_sign_key_from_string (val,
+      GNUNET_CRYPTO_eddsa_public_key_from_string (val,
                                                      strlen (val),
                                                      &issuer))
   {
@@ -406,7 +406,7 @@ GED_experiments_start ()
   char *issuers;
   char *file;
   char *pos;
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer_ID;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer_ID;
   struct GNUNET_HashCode hash;
 
   /* Load valid issuer */
@@ -425,7 +425,7 @@ GED_experiments_start ()
   valid_issuers = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
   for (pos = strtok (issuers, " "); pos != NULL; pos = strtok (NULL, " "))
   {
-    if (GNUNET_SYSERR == GNUNET_CRYPTO_ecc_public_sign_key_from_string (pos,
+    if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_public_key_from_string (pos,
                                                                         strlen (pos),
                                                                         &issuer_ID))
     {
diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c
index 73fc48bba..aa8a0dbbe 100644
--- a/src/experimentation/gnunet-daemon-experimentation_nodes.c
+++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c
@@ -254,7 +254,7 @@ append_public_key (void *cls,
                    const struct GNUNET_HashCode *key,
                    void *value)
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey **issuers = cls;
+  struct GNUNET_CRYPTO_EddsaPublicKey **issuers = cls;
   struct Issuer *issuer = value;
 
   *issuers[0] = issuer->pubkey;
@@ -278,9 +278,9 @@ send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
   struct Experimentation_Request msg;
   unsigned int my_issuer_count = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
   size_t msg_size = sizeof (msg);
-  size_t ri_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) * my_issuer_count;
+  size_t ri_size = sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) * my_issuer_count;
   size_t total_size = msg_size + ri_size;
-  struct GNUNET_CRYPTO_EccPublicSignKey *issuers;
+  struct GNUNET_CRYPTO_EddsaPublicKey *issuers;
         
   n->cth = NULL;
   if (NULL == buf)
@@ -299,7 +299,7 @@ send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
   msg.capabilities = htonl (GSE_node_capabilities);
   msg.issuer_count = htonl (my_issuer_count);
   memcpy (buf, &msg, msg_size);
-  issuers = (struct GNUNET_CRYPTO_EccPublicSignKey *) buf + msg_size;
+  issuers = (struct GNUNET_CRYPTO_EddsaPublicKey *) buf + msg_size;
   GNUNET_CONTAINER_multihashmap_iterate (valid_issuers,
                                          &append_public_key,
                                          &issuers);
@@ -325,7 +325,7 @@ send_experimentation_request (const struct GNUNET_PeerIdentity *peer)
 
   c_issuers = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
   size = sizeof (struct Experimentation_Request) +
-    c_issuers * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
+    c_issuers * sizeof (struct GNUNET_CRYPTO_EddsaPublicKey);
   n = GNUNET_new (struct Node);
   n->id = *peer;
   n->timeout_task = GNUNET_SCHEDULER_add_delayed (EXP_RESPONSE_TIMEOUT, &remove_request, n);
@@ -362,10 +362,10 @@ send_response_cb (void *cls, size_t bufsize, void *buf)
   struct Node *n = cls;
   struct Experimentation_Response msg;
   size_t c_issuers = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
-  size_t ri_size = c_issuers * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
+  size_t ri_size = c_issuers * sizeof (struct GNUNET_CRYPTO_EddsaPublicKey);
   size_t msg_size = sizeof (msg);
   size_t total_size = msg_size + ri_size;
-  struct GNUNET_CRYPTO_EccPublicSignKey *issuers;
+  struct GNUNET_CRYPTO_EddsaPublicKey *issuers;
 
   n->cth = NULL;
   if (buf == NULL)
@@ -382,7 +382,7 @@ send_response_cb (void *cls, size_t bufsize, void *buf)
   msg.capabilities = htonl (GSE_node_capabilities);
   msg.issuer_count = htonl (c_issuers);
   memcpy (buf, &msg, msg_size);
-  issuers = (struct GNUNET_CRYPTO_EccPublicSignKey *) buf + msg_size;
+  issuers = (struct GNUNET_CRYPTO_EddsaPublicKey *) buf + msg_size;
   GNUNET_CONTAINER_multihashmap_iterate (valid_issuers,
                                          &append_public_key,
                                          &issuers);
@@ -471,7 +471,7 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
   struct Node *n;
   struct NodeComCtx *e_ctx;
   const struct Experimentation_Request *rm = (const struct Experimentation_Request *) message;
-  const struct GNUNET_CRYPTO_EccPublicSignKey *rmi = (const struct GNUNET_CRYPTO_EccPublicSignKey *) &rm[1];
+  const struct GNUNET_CRYPTO_EddsaPublicKey *rmi = (const struct GNUNET_CRYPTO_EddsaPublicKey *) &rm[1];
   unsigned int my_issuer_count = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
   int c1;
   int c2;
@@ -486,7 +486,7 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
   }
   ic = ntohl (rm->issuer_count);
   if (ntohs (message->size) !=
-      sizeof (struct Experimentation_Request) + ic * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))
+      sizeof (struct Experimentation_Request) + ic * sizeof (struct GNUNET_CRYPTO_EddsaPublicKey))
   {
     GNUNET_break (0);
     return;
@@ -537,7 +537,7 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
               "Request from peer `%s' with %u issuers, we accepted %u issuer \n",
               GNUNET_i2s (peer), ic, ic_accepted);
   GNUNET_free_non_null (n->issuer_id);
-  n->issuer_id = GNUNET_malloc (ic_accepted * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey));
+  n->issuer_id = GNUNET_malloc (ic_accepted * sizeof (struct GNUNET_CRYPTO_EddsaPublicKey));
   c2 = 0;
   for (c1 = 0; c1 < ic; c1++)
   {
@@ -557,7 +557,7 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
   e_ctx->n = n;
   e_ctx->e = NULL;
   e_ctx->size = sizeof (struct Experimentation_Response) +
-    my_issuer_count * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
+    my_issuer_count * sizeof (struct GNUNET_CRYPTO_EddsaPublicKey);
   e_ctx->notify = &send_response_cb;
   e_ctx->notify_cls = n;
 
@@ -577,7 +577,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
 {
   struct Node *n;
   const struct Experimentation_Response *rm = (const struct Experimentation_Response *) message;
-  const struct GNUNET_CRYPTO_EccPublicSignKey *rmi = (const struct GNUNET_CRYPTO_EccPublicSignKey *) &rm[1];
+  const struct GNUNET_CRYPTO_EddsaPublicKey *rmi = (const struct GNUNET_CRYPTO_EddsaPublicKey *) &rm[1];
   uint32_t ic;
   uint32_t ic_accepted;
   int make_active;
@@ -590,7 +590,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
       return;
     }
   ic = ntohl (rm->issuer_count);
-  if (ntohs (message->size) != sizeof (struct Experimentation_Response) + ic * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))
+  if (ntohs (message->size) != sizeof (struct Experimentation_Response) + ic * sizeof (struct GNUNET_CRYPTO_EddsaPublicKey))
   {
     GNUNET_break (0);
     return;