[GNUnet-SVN] r30126 - gnunet/src/multicast

[gnunet]

Author: grothoff
Date: 2013-10-11 09:56:32 +0200 (Fri, 11 Oct 2013)
New Revision: 30126

Modified:
   gnunet/src/multicast/multicast.h
   gnunet/src/multicast/multicast_api.c
Log:
-fix ftbfs

Modified: gnunet/src/multicast/multicast.h
===================================================================
--- gnunet/src/multicast/multicast.h    2013-10-10 21:50:28 UTC (rev 30125)
+++ gnunet/src/multicast/multicast.h    2013-10-11 07:56:32 UTC (rev 30126)
@@ -156,7 +156,7 @@
   /**
    * Private, non-ephemeral key for the mutlicast group.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey group_key;
+  struct GNUNET_CRYPTO_EddsaPrivateKey group_key;
 
   /**
    * Last fragment ID, used to continue counting fragments if we resume 
operating
@@ -222,12 +222,12 @@
   /**
    * Public non-ephemeral key of the mutlicast group.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey group_key;
+  struct GNUNET_CRYPTO_EddsaPublicKey group_key;
 
   /**
    * Our private key for the group.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey member_key;
+  struct GNUNET_CRYPTO_EddsaPrivateKey member_key;
 
   /* followed by 'relay_count' `struct GNUNET_PeerIdentity`s */
 

Modified: gnunet/src/multicast/multicast_api.c
===================================================================
--- gnunet/src/multicast/multicast_api.c        2013-10-10 21:50:28 UTC (rev 
30125)
+++ gnunet/src/multicast/multicast_api.c        2013-10-11 07:56:32 UTC (rev 
30126)
@@ -54,7 +54,7 @@
  */
 struct GNUNET_MULTICAST_Origin
 {
-  struct GNUNET_CRYPTO_EccPrivateKey priv_key;
+  struct GNUNET_CRYPTO_EddsaPrivateKey priv_key;
   struct GNUNET_MULTICAST_OriginMessageHandle msg_handle;
 
   GNUNET_MULTICAST_JoinCallback join_cb;
@@ -100,14 +100,14 @@
   /**
    * Public key of the sending member.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey member_key;
+  struct GNUNET_CRYPTO_EddsaPublicKey member_key;
 
   /**
    * ECC signature of the request fragment.
    *
    * Signature must match the public key of the multicast group.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EddsaSignature signature;
 
   /**
    * Purpose for the signature and size of the signed data.
@@ -154,7 +154,7 @@
    *
    * Signature must match the public key of the joining member.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EddsaSignature signature;
 
   /**
    * Purpose for the signature and size of the signed data.
@@ -164,12 +164,12 @@
   /**
    * Public key of the target group.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey group_key;
+  struct GNUNET_CRYPTO_EddsaPublicKey group_key;
 
   /**
    * Public key of the joining member.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey member_key;
+  struct GNUNET_CRYPTO_EddsaPublicKey member_key;
 
   /**
    * Peer identity of the joining member.
@@ -329,7 +329,7 @@
  */
 struct GNUNET_MULTICAST_Origin *
 GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const struct GNUNET_CRYPTO_EccPrivateKey 
*priv_key,
+                               const struct GNUNET_CRYPTO_EddsaPrivateKey 
*priv_key,
                                uint64_t next_fragment_id,
                                GNUNET_MULTICAST_JoinCallback join_cb,
                                GNUNET_MULTICAST_MembershipTestCallback 
mem_test_cb,
@@ -393,7 +393,7 @@
                              - sizeof (msg->signature));
   msg->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MULTICAST_MESSAGE);
 
-  if (GNUNET_OK != GNUNET_CRYPTO_ecc_sign (&orig->priv_key, &msg->purpose,
+  if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign (&orig->priv_key, &msg->purpose,
                                            &msg->signature))
   {
     /* FIXME: handle error */
@@ -523,8 +523,8 @@
  */
 struct GNUNET_MULTICAST_Member *
 GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              const struct GNUNET_CRYPTO_EccPublicSignKey 
*group_key,
-                              const struct GNUNET_CRYPTO_EccPrivateKey 
*member_key,
+                              const struct GNUNET_CRYPTO_EddsaPublicKey 
*group_key,
+                              const struct GNUNET_CRYPTO_EddsaPrivateKey 
*member_key,
                               const struct GNUNET_PeerIdentity *origin,
                               uint32_t relay_count,
                               const struct GNUNET_PeerIdentity *relays,