diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-11 07:56:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-11 07:56:32 +0000 |
commit | 606bd84112a88ad364839301aac477be8d8a4e6c (patch) | |
tree | 40c7eee5a1d78824f11a0d200f774ccf48412047 /src/multicast | |
parent | 9b254cc0bcac0e9a167008fea2270351c5f5e62a (diff) | |
download | gnunet-606bd84112a88ad364839301aac477be8d8a4e6c.tar.gz gnunet-606bd84112a88ad364839301aac477be8d8a4e6c.zip |
-fix ftbfs
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/multicast.h | 6 | ||||
-rw-r--r-- | src/multicast/multicast_api.c | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h index 3257af1a4..88cb2d99e 100644 --- a/src/multicast/multicast.h +++ b/src/multicast/multicast.h | |||
@@ -156,7 +156,7 @@ struct MulticastOriginStartMessage | |||
156 | /** | 156 | /** |
157 | * Private, non-ephemeral key for the mutlicast group. | 157 | * Private, non-ephemeral key for the mutlicast group. |
158 | */ | 158 | */ |
159 | struct GNUNET_CRYPTO_EccPrivateKey group_key; | 159 | struct GNUNET_CRYPTO_EddsaPrivateKey group_key; |
160 | 160 | ||
161 | /** | 161 | /** |
162 | * Last fragment ID, used to continue counting fragments if we resume operating | 162 | * Last fragment ID, used to continue counting fragments if we resume operating |
@@ -222,12 +222,12 @@ struct MulticastJoinMessage | |||
222 | /** | 222 | /** |
223 | * Public non-ephemeral key of the mutlicast group. | 223 | * Public non-ephemeral key of the mutlicast group. |
224 | */ | 224 | */ |
225 | struct GNUNET_CRYPTO_EccPublicSignKey group_key; | 225 | struct GNUNET_CRYPTO_EddsaPublicKey group_key; |
226 | 226 | ||
227 | /** | 227 | /** |
228 | * Our private key for the group. | 228 | * Our private key for the group. |
229 | */ | 229 | */ |
230 | struct GNUNET_CRYPTO_EccPrivateKey member_key; | 230 | struct GNUNET_CRYPTO_EddsaPrivateKey member_key; |
231 | 231 | ||
232 | /* followed by 'relay_count' `struct GNUNET_PeerIdentity`s */ | 232 | /* followed by 'relay_count' `struct GNUNET_PeerIdentity`s */ |
233 | 233 | ||
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 49e648468..31a02b96d 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -54,7 +54,7 @@ struct GNUNET_MULTICAST_OriginMessageHandle | |||
54 | */ | 54 | */ |
55 | struct GNUNET_MULTICAST_Origin | 55 | struct GNUNET_MULTICAST_Origin |
56 | { | 56 | { |
57 | struct GNUNET_CRYPTO_EccPrivateKey priv_key; | 57 | struct GNUNET_CRYPTO_EddsaPrivateKey priv_key; |
58 | struct GNUNET_MULTICAST_OriginMessageHandle msg_handle; | 58 | struct GNUNET_MULTICAST_OriginMessageHandle msg_handle; |
59 | 59 | ||
60 | GNUNET_MULTICAST_JoinCallback join_cb; | 60 | GNUNET_MULTICAST_JoinCallback join_cb; |
@@ -100,14 +100,14 @@ struct GNUNET_MULTICAST_RequestHeader | |||
100 | /** | 100 | /** |
101 | * Public key of the sending member. | 101 | * Public key of the sending member. |
102 | */ | 102 | */ |
103 | struct GNUNET_CRYPTO_EccPublicSignKey member_key; | 103 | struct GNUNET_CRYPTO_EddsaPublicKey member_key; |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * ECC signature of the request fragment. | 106 | * ECC signature of the request fragment. |
107 | * | 107 | * |
108 | * Signature must match the public key of the multicast group. | 108 | * Signature must match the public key of the multicast group. |
109 | */ | 109 | */ |
110 | struct GNUNET_CRYPTO_EccSignature signature; | 110 | struct GNUNET_CRYPTO_EddsaSignature signature; |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Purpose for the signature and size of the signed data. | 113 | * Purpose for the signature and size of the signed data. |
@@ -154,7 +154,7 @@ struct GNUNET_MULTICAST_JoinRequest | |||
154 | * | 154 | * |
155 | * Signature must match the public key of the joining member. | 155 | * Signature must match the public key of the joining member. |
156 | */ | 156 | */ |
157 | struct GNUNET_CRYPTO_EccSignature signature; | 157 | struct GNUNET_CRYPTO_EddsaSignature signature; |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * Purpose for the signature and size of the signed data. | 160 | * Purpose for the signature and size of the signed data. |
@@ -164,12 +164,12 @@ struct GNUNET_MULTICAST_JoinRequest | |||
164 | /** | 164 | /** |
165 | * Public key of the target group. | 165 | * Public key of the target group. |
166 | */ | 166 | */ |
167 | struct GNUNET_CRYPTO_EccPublicSignKey group_key; | 167 | struct GNUNET_CRYPTO_EddsaPublicKey group_key; |
168 | 168 | ||
169 | /** | 169 | /** |
170 | * Public key of the joining member. | 170 | * Public key of the joining member. |
171 | */ | 171 | */ |
172 | struct GNUNET_CRYPTO_EccPublicSignKey member_key; | 172 | struct GNUNET_CRYPTO_EddsaPublicKey member_key; |
173 | 173 | ||
174 | /** | 174 | /** |
175 | * Peer identity of the joining member. | 175 | * Peer identity of the joining member. |
@@ -329,7 +329,7 @@ GNUNET_MULTICAST_replay_response2 (struct GNUNET_MULTICAST_ReplayHandle *rh, | |||
329 | */ | 329 | */ |
330 | struct GNUNET_MULTICAST_Origin * | 330 | struct GNUNET_MULTICAST_Origin * |
331 | GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | 331 | GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg, |
332 | const struct GNUNET_CRYPTO_EccPrivateKey *priv_key, | 332 | const struct GNUNET_CRYPTO_EddsaPrivateKey *priv_key, |
333 | uint64_t next_fragment_id, | 333 | uint64_t next_fragment_id, |
334 | GNUNET_MULTICAST_JoinCallback join_cb, | 334 | GNUNET_MULTICAST_JoinCallback join_cb, |
335 | GNUNET_MULTICAST_MembershipTestCallback mem_test_cb, | 335 | GNUNET_MULTICAST_MembershipTestCallback mem_test_cb, |
@@ -393,7 +393,7 @@ schedule_origin_to_all (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc | |||
393 | - sizeof (msg->signature)); | 393 | - sizeof (msg->signature)); |
394 | msg->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MULTICAST_MESSAGE); | 394 | msg->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MULTICAST_MESSAGE); |
395 | 395 | ||
396 | if (GNUNET_OK != GNUNET_CRYPTO_ecc_sign (&orig->priv_key, &msg->purpose, | 396 | if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign (&orig->priv_key, &msg->purpose, |
397 | &msg->signature)) | 397 | &msg->signature)) |
398 | { | 398 | { |
399 | /* FIXME: handle error */ | 399 | /* FIXME: handle error */ |
@@ -523,8 +523,8 @@ GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin) | |||
523 | */ | 523 | */ |
524 | struct GNUNET_MULTICAST_Member * | 524 | struct GNUNET_MULTICAST_Member * |
525 | GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | 525 | GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, |
526 | const struct GNUNET_CRYPTO_EccPublicSignKey *group_key, | 526 | const struct GNUNET_CRYPTO_EddsaPublicKey *group_key, |
527 | const struct GNUNET_CRYPTO_EccPrivateKey *member_key, | 527 | const struct GNUNET_CRYPTO_EddsaPrivateKey *member_key, |
528 | const struct GNUNET_PeerIdentity *origin, | 528 | const struct GNUNET_PeerIdentity *origin, |
529 | uint32_t relay_count, | 529 | uint32_t relay_count, |
530 | const struct GNUNET_PeerIdentity *relays, | 530 | const struct GNUNET_PeerIdentity *relays, |