diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-10 17:09:45 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-10 17:09:45 +0000 |
commit | 5d7d01298cfcde6516cecac01f6bfff31bc20461 (patch) | |
tree | b755a0535a68d3f2f1df4ad266e256954abe2472 | |
parent | 42c354283221489bf52e0ab4fcc6617e0d691934 (diff) | |
download | gnunet-5d7d01298cfcde6516cecac01f6bfff31bc20461.tar.gz gnunet-5d7d01298cfcde6516cecac01f6bfff31bc20461.zip |
-fix eddsa api migration
-rw-r--r-- | src/conversation/conversation.h | 8 | ||||
-rw-r--r-- | src/conversation/conversation_api.c | 8 | ||||
-rw-r--r-- | src/conversation/gnunet-service-conversation.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h index 4b42277a5..e2316984a 100644 --- a/src/conversation/conversation.h +++ b/src/conversation/conversation.h | |||
@@ -89,7 +89,7 @@ struct ClientPhoneRingMessage | |||
89 | /** | 89 | /** |
90 | * Who is calling us? | 90 | * Who is calling us? |
91 | */ | 91 | */ |
92 | struct GNUNET_CRYPTO_EccPublicSignKey caller_id; | 92 | struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; |
93 | 93 | ||
94 | }; | 94 | }; |
95 | 95 | ||
@@ -176,7 +176,7 @@ struct ClientCallMessage | |||
176 | /** | 176 | /** |
177 | * Identity of the caller. | 177 | * Identity of the caller. |
178 | */ | 178 | */ |
179 | struct GNUNET_CRYPTO_EccPrivateKey caller_id; | 179 | struct GNUNET_CRYPTO_EcdsaPrivateKey caller_id; |
180 | }; | 180 | }; |
181 | 181 | ||
182 | 182 | ||
@@ -219,7 +219,7 @@ struct MeshPhoneRingMessage | |||
219 | /** | 219 | /** |
220 | * Who is calling us? (also who is signing). | 220 | * Who is calling us? (also who is signing). |
221 | */ | 221 | */ |
222 | struct GNUNET_CRYPTO_EccPublicSignKey caller_id; | 222 | struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; |
223 | 223 | ||
224 | /** | 224 | /** |
225 | * Who are we calling? | 225 | * Who are we calling? |
@@ -239,7 +239,7 @@ struct MeshPhoneRingMessage | |||
239 | /** | 239 | /** |
240 | * Signature on the above. | 240 | * Signature on the above. |
241 | */ | 241 | */ |
242 | struct GNUNET_CRYPTO_EccSignature signature; | 242 | struct GNUNET_CRYPTO_EcdsaSignature signature; |
243 | 243 | ||
244 | /** | 244 | /** |
245 | * Source line for audio data in the other direction. | 245 | * Source line for audio data in the other direction. |
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 50ee0a23a..4f182d63b 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -124,12 +124,12 @@ struct GNUNET_CONVERSATION_Phone | |||
124 | /** | 124 | /** |
125 | * My GNS zone. | 125 | * My GNS zone. |
126 | */ | 126 | */ |
127 | struct GNUNET_CRYPTO_EccPrivateKey my_zone; | 127 | struct GNUNET_CRYPTO_EcdsaPrivateKey my_zone; |
128 | 128 | ||
129 | /** | 129 | /** |
130 | * Identity of the person calling us (valid while in state #PS_RINGING). | 130 | * Identity of the person calling us (valid while in state #PS_RINGING). |
131 | */ | 131 | */ |
132 | struct GNUNET_CRYPTO_EccPublicSignKey caller_id; | 132 | struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; |
133 | 133 | ||
134 | /** | 134 | /** |
135 | * State machine for the phone. | 135 | * State machine for the phone. |
@@ -159,7 +159,7 @@ reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone); | |||
159 | */ | 159 | */ |
160 | static void | 160 | static void |
161 | handle_caller_name (void *cls, | 161 | handle_caller_name (void *cls, |
162 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, | 162 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
163 | const char *label, | 163 | const char *label, |
164 | unsigned int rd_count, | 164 | unsigned int rd_count, |
165 | const struct GNUNET_NAMESTORE_RecordData *rd) | 165 | const struct GNUNET_NAMESTORE_RecordData *rd) |
@@ -985,7 +985,7 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call) | |||
985 | 0 }, | 985 | 0 }, |
986 | { NULL, 0, 0 } | 986 | { NULL, 0, 0 } |
987 | }; | 987 | }; |
988 | struct GNUNET_CRYPTO_EccPublicSignKey my_zone; | 988 | struct GNUNET_CRYPTO_EcdsaPublicKey my_zone; |
989 | 989 | ||
990 | if (CS_ACTIVE == call->state) | 990 | if (CS_ACTIVE == call->state) |
991 | { | 991 | { |
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index d19be5318..e0c10e533 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c | |||
@@ -503,15 +503,15 @@ handle_client_call_message (void *cls, | |||
503 | ring->purpose.size = htonl (sizeof (struct GNUNET_PeerIdentity) * 2 + | 503 | ring->purpose.size = htonl (sizeof (struct GNUNET_PeerIdentity) * 2 + |
504 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 504 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
505 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + | 505 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + |
506 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)); | 506 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); |
507 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&msg->caller_id, | 507 | GNUNET_CRYPTO_ecdsa_key_get_public (&msg->caller_id, |
508 | &ring->caller_id); | 508 | &ring->caller_id); |
509 | ring->remote_line = msg->line; | 509 | ring->remote_line = msg->line; |
510 | ring->source_line = line->local_line; | 510 | ring->source_line = line->local_line; |
511 | ring->target = msg->target; | 511 | ring->target = msg->target; |
512 | ring->source = my_identity; | 512 | ring->source = my_identity; |
513 | ring->expiration_time = GNUNET_TIME_absolute_hton (GNUNET_TIME_relative_to_absolute (RING_TIMEOUT)); | 513 | ring->expiration_time = GNUNET_TIME_absolute_hton (GNUNET_TIME_relative_to_absolute (RING_TIMEOUT)); |
514 | GNUNET_CRYPTO_ecc_sign (&msg->caller_id, | 514 | GNUNET_CRYPTO_ecdsa_sign (&msg->caller_id, |
515 | &ring->purpose, | 515 | &ring->purpose, |
516 | &ring->signature); | 516 | &ring->signature); |
517 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 517 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -680,9 +680,9 @@ handle_mesh_ring_message (void *cls, | |||
680 | if ( (msg->purpose.size != htonl (sizeof (struct GNUNET_PeerIdentity) * 2 + | 680 | if ( (msg->purpose.size != htonl (sizeof (struct GNUNET_PeerIdentity) * 2 + |
681 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 681 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
682 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + | 682 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + |
683 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))) || | 683 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))) || |
684 | (GNUNET_OK != | 684 | (GNUNET_OK != |
685 | GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING, | 685 | GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING, |
686 | &msg->purpose, | 686 | &msg->purpose, |
687 | &msg->signature, | 687 | &msg->signature, |
688 | &msg->caller_id)) ) | 688 | &msg->caller_id)) ) |