-fix eddsa api migration

diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h
index 4b42277a55fcf6fb3437d5c98f12079ef56735ea..e2316984ad5a2a761dbd4ac3dba7b1a191d69fa0 100644 (file)
--- a/src/conversation/conversation.h
+++ b/src/conversation/conversation.h
@@ -89,7 +89,7 @@ struct ClientPhoneRingMessage
   /**
    * Who is calling us?
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
 
 };
 
@@ -176,7 +176,7 @@ struct ClientCallMessage
   /**
    * Identity of the caller.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey caller_id;
 };
 
 
@@ -219,7 +219,7 @@ struct MeshPhoneRingMessage
   /**
    * Who is calling us? (also who is signing).
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
 
   /**
    * Who are we calling?
@@ -239,7 +239,7 @@ struct MeshPhoneRingMessage
   /**
    * Signature on the above.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Source line for audio data in the other direction.

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 50ee0a23a2c080e2bdb8ae089fc52589c3ef8e08..4f182d63b61677c4a7ce052caf581c0404501772 100644 (file)
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -124,12 +124,12 @@ struct GNUNET_CONVERSATION_Phone
   /**
    * My GNS zone.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey my_zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey my_zone;
 
   /**
    * Identity of the person calling us (valid while in state #PS_RINGING).
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
 
   /**
    * State machine for the phone.
@@ -159,7 +159,7 @@ reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone);
  */
 static void
 handle_caller_name (void *cls,
-                    const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
                     const char *label,
                     unsigned int rd_count,
                     const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -985,7 +985,7 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call)
       0 },
     { NULL, 0, 0 }
   };
-  struct GNUNET_CRYPTO_EccPublicSignKey my_zone;
+  struct GNUNET_CRYPTO_EcdsaPublicKey my_zone;
 
   if (CS_ACTIVE == call->state)
   {

diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index d19be53182be63273529cafb39a282294dc8545b..e0c10e5334f48bc9124264e5c5e341dbb893e4e9 100644 (file)
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -503,15 +503,15 @@ handle_client_call_message (void *cls,
   ring->purpose.size = htonl (sizeof (struct GNUNET_PeerIdentity) * 2 +
                               sizeof (struct GNUNET_TIME_AbsoluteNBO) +
                               sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
-                              sizeof (struct GNUNET_CRYPTO_EccPublicSignKey));
-  GNUNET_CRYPTO_ecc_key_get_public_for_signature (&msg->caller_id,
+                              sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
+  GNUNET_CRYPTO_ecdsa_key_get_public (&msg->caller_id,
                                                   &ring->caller_id);
   ring->remote_line = msg->line;
   ring->source_line = line->local_line;
   ring->target = msg->target;
   ring->source = my_identity;
   ring->expiration_time = GNUNET_TIME_absolute_hton (GNUNET_TIME_relative_to_absolute (RING_TIMEOUT));
-  GNUNET_CRYPTO_ecc_sign (&msg->caller_id,
+  GNUNET_CRYPTO_ecdsa_sign (&msg->caller_id,
                           &ring->purpose,
                           &ring->signature);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -680,9 +680,9 @@ handle_mesh_ring_message (void *cls,
   if ( (msg->purpose.size != htonl (sizeof (struct GNUNET_PeerIdentity) * 2 +
                                     sizeof (struct GNUNET_TIME_AbsoluteNBO) +
                                     sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
-                                    sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))) ||
+                                    sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))) ||
        (GNUNET_OK !=
-        GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING,
+        GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING,
                                   &msg->purpose,
                                   &msg->signature,
                                   &msg->caller_id)) )