[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30114 - gnunet/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30114 - gnunet/src/conversation |
Date: |
Thu, 10 Oct 2013 19:09:45 +0200 |
Author: grothoff
Date: 2013-10-10 19:09:45 +0200 (Thu, 10 Oct 2013)
New Revision: 30114
Modified:
gnunet/src/conversation/conversation.h
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/gnunet-service-conversation.c
Log:
-fix eddsa api migration
Modified: gnunet/src/conversation/conversation.h
===================================================================
--- gnunet/src/conversation/conversation.h 2013-10-10 17:03:07 UTC (rev
30113)
+++ gnunet/src/conversation/conversation.h 2013-10-10 17:09:45 UTC (rev
30114)
@@ -89,7 +89,7 @@
/**
* Who is calling us?
*/
- struct GNUNET_CRYPTO_EccPublicSignKey caller_id;
+ struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
};
@@ -176,7 +176,7 @@
/**
* Identity of the caller.
*/
- struct GNUNET_CRYPTO_EccPrivateKey caller_id;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey caller_id;
};
@@ -219,7 +219,7 @@
/**
* 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 @@
/**
* Signature on the above.
*/
- struct GNUNET_CRYPTO_EccSignature signature;
+ struct GNUNET_CRYPTO_EcdsaSignature signature;
/**
* Source line for audio data in the other direction.
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2013-10-10 17:03:07 UTC (rev
30113)
+++ gnunet/src/conversation/conversation_api.c 2013-10-10 17:09:45 UTC (rev
30114)
@@ -124,12 +124,12 @@
/**
* 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 @@
*/
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 @@
0 },
{ NULL, 0, 0 }
};
- struct GNUNET_CRYPTO_EccPublicSignKey my_zone;
+ struct GNUNET_CRYPTO_EcdsaPublicKey my_zone;
if (CS_ACTIVE == call->state)
{
Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c 2013-10-10
17:03:07 UTC (rev 30113)
+++ gnunet/src/conversation/gnunet-service-conversation.c 2013-10-10
17:09:45 UTC (rev 30114)
@@ -503,15 +503,15 @@
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 @@
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)) )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30114 - gnunet/src/conversation,
gnunet <=