diff options
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 8 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.h | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_blacklist.c | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_hello.c | 4 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_hello.h | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 14 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_validation.c | 26 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_validation.h | 2 | ||||
-rw-r--r-- | src/transport/gnunet-transport.c | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 2 | ||||
-rw-r--r-- | src/transport/test_plugin_transport.c | 6 |
11 files changed, 35 insertions, 35 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index d6be384bd..6d2e1831e 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -70,7 +70,7 @@ static struct GNUNET_SERVER_Handle *GST_server; | |||
70 | /** | 70 | /** |
71 | * Our private key. | 71 | * Our private key. |
72 | */ | 72 | */ |
73 | struct GNUNET_CRYPTO_EccPrivateKey *GST_my_private_key; | 73 | struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key; |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * ATS handle. | 76 | * ATS handle. |
@@ -738,7 +738,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
738 | const struct GNUNET_CONFIGURATION_Handle *c) | 738 | const struct GNUNET_CONFIGURATION_Handle *c) |
739 | { | 739 | { |
740 | char *keyfile; | 740 | char *keyfile; |
741 | struct GNUNET_CRYPTO_EccPrivateKey *pk; | 741 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; |
742 | long long unsigned int max_fd_cfg; | 742 | long long unsigned int max_fd_cfg; |
743 | int max_fd_rlimit; | 743 | int max_fd_rlimit; |
744 | int max_fd; | 744 | int max_fd; |
@@ -763,14 +763,14 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
763 | hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION; | 763 | hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION; |
764 | } | 764 | } |
765 | GST_server = server; | 765 | GST_server = server; |
766 | pk = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 766 | pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile); |
767 | GNUNET_free (keyfile); | 767 | GNUNET_free (keyfile); |
768 | GNUNET_assert (NULL != pk); | 768 | GNUNET_assert (NULL != pk); |
769 | GST_my_private_key = pk; | 769 | GST_my_private_key = pk; |
770 | 770 | ||
771 | GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg); | 771 | GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg); |
772 | GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg); | 772 | GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg); |
773 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (GST_my_private_key, | 773 | GNUNET_CRYPTO_eddsa_key_get_public (GST_my_private_key, |
774 | &GST_my_identity.public_key); | 774 | &GST_my_identity.public_key); |
775 | GNUNET_assert (NULL != GST_my_private_key); | 775 | GNUNET_assert (NULL != GST_my_private_key); |
776 | 776 | ||
diff --git a/src/transport/gnunet-service-transport.h b/src/transport/gnunet-service-transport.h index 9b68cb258..66da0163e 100644 --- a/src/transport/gnunet-service-transport.h +++ b/src/transport/gnunet-service-transport.h | |||
@@ -55,7 +55,7 @@ extern struct GNUNET_PEERINFO_Handle *GST_peerinfo; | |||
55 | /** | 55 | /** |
56 | * Our private key. | 56 | * Our private key. |
57 | */ | 57 | */ |
58 | extern struct GNUNET_CRYPTO_EccPrivateKey *GST_my_private_key; | 58 | extern struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key; |
59 | 59 | ||
60 | /** | 60 | /** |
61 | * ATS handle. | 61 | * ATS handle. |
diff --git a/src/transport/gnunet-service-transport_blacklist.c b/src/transport/gnunet-service-transport_blacklist.c index 8f45a19b8..87d753929 100644 --- a/src/transport/gnunet-service-transport_blacklist.c +++ b/src/transport/gnunet-service-transport_blacklist.c | |||
@@ -254,7 +254,7 @@ blacklist_cfg_iter (void *cls, const char *section, | |||
254 | char *plugs; | 254 | char *plugs; |
255 | char *pos; | 255 | char *pos; |
256 | 256 | ||
257 | if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string (option, | 257 | if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (option, |
258 | strlen (option), | 258 | strlen (option), |
259 | &peer.public_key)) | 259 | &peer.public_key)) |
260 | return; | 260 | return; |
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c index a53e26f95..6bf707755 100644 --- a/src/transport/gnunet-service-transport_hello.c +++ b/src/transport/gnunet-service-transport_hello.c | |||
@@ -74,7 +74,7 @@ struct OwnAddressList | |||
74 | /** | 74 | /** |
75 | * Signature for a 'struct TransportPongMessage' for this address. | 75 | * Signature for a 'struct TransportPongMessage' for this address. |
76 | */ | 76 | */ |
77 | struct GNUNET_CRYPTO_EccSignature pong_signature; | 77 | struct GNUNET_CRYPTO_EddsaSignature pong_signature; |
78 | 78 | ||
79 | }; | 79 | }; |
80 | 80 | ||
@@ -307,7 +307,7 @@ GST_hello_modify_addresses (int addremove, | |||
307 | */ | 307 | */ |
308 | int | 308 | int |
309 | GST_hello_test_address (const struct GNUNET_HELLO_Address *address, | 309 | GST_hello_test_address (const struct GNUNET_HELLO_Address *address, |
310 | struct GNUNET_CRYPTO_EccSignature **sig, | 310 | struct GNUNET_CRYPTO_EddsaSignature **sig, |
311 | struct GNUNET_TIME_Absolute **sig_expiration) | 311 | struct GNUNET_TIME_Absolute **sig_expiration) |
312 | { | 312 | { |
313 | struct OwnAddressList *al; | 313 | struct OwnAddressList *al; |
diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h index 2aefbe300..0c67cef4d 100644 --- a/src/transport/gnunet-service-transport_hello.h +++ b/src/transport/gnunet-service-transport_hello.h | |||
@@ -93,7 +93,7 @@ GST_hello_modify_addresses (int addremove, | |||
93 | */ | 93 | */ |
94 | int | 94 | int |
95 | GST_hello_test_address (const struct GNUNET_HELLO_Address *address, | 95 | GST_hello_test_address (const struct GNUNET_HELLO_Address *address, |
96 | struct GNUNET_CRYPTO_EccSignature **sig, | 96 | struct GNUNET_CRYPTO_EddsaSignature **sig, |
97 | struct GNUNET_TIME_Absolute **sig_expiration); | 97 | struct GNUNET_TIME_Absolute **sig_expiration); |
98 | 98 | ||
99 | 99 | ||
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 0cffe0aeb..d89aa2f32 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -329,14 +329,14 @@ struct SessionDisconnectMessage | |||
329 | /** | 329 | /** |
330 | * Public key of the sender. | 330 | * Public key of the sender. |
331 | */ | 331 | */ |
332 | struct GNUNET_CRYPTO_EccPublicSignKey public_key; | 332 | struct GNUNET_CRYPTO_EddsaPublicKey public_key; |
333 | 333 | ||
334 | /** | 334 | /** |
335 | * Signature of the peer that sends us the disconnect. Only | 335 | * Signature of the peer that sends us the disconnect. Only |
336 | * valid if the timestamp is AFTER the timestamp from the | 336 | * valid if the timestamp is AFTER the timestamp from the |
337 | * corresponding 'CONNECT' message. | 337 | * corresponding 'CONNECT' message. |
338 | */ | 338 | */ |
339 | struct GNUNET_CRYPTO_EccSignature signature; | 339 | struct GNUNET_CRYPTO_EddsaSignature signature; |
340 | 340 | ||
341 | }; | 341 | }; |
342 | 342 | ||
@@ -1195,7 +1195,7 @@ send_disconnect (struct NeighbourMapEntry *n) | |||
1195 | disconnect_msg.reserved = htonl (0); | 1195 | disconnect_msg.reserved = htonl (0); |
1196 | disconnect_msg.purpose.size = | 1196 | disconnect_msg.purpose.size = |
1197 | htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + | 1197 | htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + |
1198 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + | 1198 | sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) + |
1199 | sizeof (struct GNUNET_TIME_AbsoluteNBO)); | 1199 | sizeof (struct GNUNET_TIME_AbsoluteNBO)); |
1200 | disconnect_msg.purpose.purpose = | 1200 | disconnect_msg.purpose.purpose = |
1201 | htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT); | 1201 | htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT); |
@@ -1203,7 +1203,7 @@ send_disconnect (struct NeighbourMapEntry *n) | |||
1203 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | 1203 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); |
1204 | disconnect_msg.public_key = GST_my_identity.public_key; | 1204 | disconnect_msg.public_key = GST_my_identity.public_key; |
1205 | GNUNET_assert (GNUNET_OK == | 1205 | GNUNET_assert (GNUNET_OK == |
1206 | GNUNET_CRYPTO_ecc_sign (GST_my_private_key, | 1206 | GNUNET_CRYPTO_eddsa_sign (GST_my_private_key, |
1207 | &disconnect_msg.purpose, | 1207 | &disconnect_msg.purpose, |
1208 | &disconnect_msg.signature)); | 1208 | &disconnect_msg.signature)); |
1209 | 1209 | ||
@@ -3157,7 +3157,7 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity | |||
3157 | return; | 3157 | return; |
3158 | } | 3158 | } |
3159 | GNUNET_CRYPTO_hash (&sdm->public_key, | 3159 | GNUNET_CRYPTO_hash (&sdm->public_key, |
3160 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), | 3160 | sizeof (struct GNUNET_CRYPTO_EddsaPublicKey), |
3161 | &hc); | 3161 | &hc); |
3162 | if (0 != memcmp (peer, &hc, sizeof (struct GNUNET_PeerIdentity))) | 3162 | if (0 != memcmp (peer, &hc, sizeof (struct GNUNET_PeerIdentity))) |
3163 | { | 3163 | { |
@@ -3166,7 +3166,7 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity | |||
3166 | } | 3166 | } |
3167 | if (ntohl (sdm->purpose.size) != | 3167 | if (ntohl (sdm->purpose.size) != |
3168 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + | 3168 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + |
3169 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + | 3169 | sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) + |
3170 | sizeof (struct GNUNET_TIME_AbsoluteNBO)) | 3170 | sizeof (struct GNUNET_TIME_AbsoluteNBO)) |
3171 | { | 3171 | { |
3172 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3172 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
@@ -3177,7 +3177,7 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity | |||
3177 | return; | 3177 | return; |
3178 | } | 3178 | } |
3179 | if (GNUNET_OK != | 3179 | if (GNUNET_OK != |
3180 | GNUNET_CRYPTO_ecc_verify | 3180 | GNUNET_CRYPTO_eddsa_verify |
3181 | (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT, &sdm->purpose, | 3181 | (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT, &sdm->purpose, |
3182 | &sdm->signature, &sdm->public_key)) | 3182 | &sdm->signature, &sdm->public_key)) |
3183 | { | 3183 | { |
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index 6018e2c7b..f5f3d6d56 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c | |||
@@ -148,7 +148,7 @@ struct TransportPongMessage | |||
148 | /** | 148 | /** |
149 | * Signature. | 149 | * Signature. |
150 | */ | 150 | */ |
151 | struct GNUNET_CRYPTO_EccSignature signature; | 151 | struct GNUNET_CRYPTO_EddsaSignature signature; |
152 | 152 | ||
153 | /** | 153 | /** |
154 | * GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN to confirm that this is a | 154 | * GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN to confirm that this is a |
@@ -189,7 +189,7 @@ struct ValidationEntry | |||
189 | /** | 189 | /** |
190 | * Public key of the peer. | 190 | * Public key of the peer. |
191 | */ | 191 | */ |
192 | struct GNUNET_CRYPTO_EccPublicSignKey public_key; | 192 | struct GNUNET_CRYPTO_EddsaPublicKey public_key; |
193 | 193 | ||
194 | /** | 194 | /** |
195 | * The identity of the peer. FIXME: duplicated (also in 'address') | 195 | * The identity of the peer. FIXME: duplicated (also in 'address') |
@@ -199,7 +199,7 @@ struct ValidationEntry | |||
199 | /** | 199 | /** |
200 | * Cached PONG signature | 200 | * Cached PONG signature |
201 | */ | 201 | */ |
202 | struct GNUNET_CRYPTO_EccSignature pong_sig_cache; | 202 | struct GNUNET_CRYPTO_EddsaSignature pong_sig_cache; |
203 | 203 | ||
204 | /** | 204 | /** |
205 | * ID of task that will clean up this entry if nothing happens. | 205 | * ID of task that will clean up this entry if nothing happens. |
@@ -678,7 +678,7 @@ revalidate_address (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
678 | * if we don't have an existing entry and no public key was given | 678 | * if we don't have an existing entry and no public key was given |
679 | */ | 679 | */ |
680 | static struct ValidationEntry * | 680 | static struct ValidationEntry * |
681 | find_validation_entry (const struct GNUNET_CRYPTO_EccPublicSignKey *public_key, | 681 | find_validation_entry (const struct GNUNET_CRYPTO_EddsaPublicKey *public_key, |
682 | const struct GNUNET_HELLO_Address *address) | 682 | const struct GNUNET_HELLO_Address *address) |
683 | { | 683 | { |
684 | struct ValidationEntryMatchContext vemc; | 684 | struct ValidationEntryMatchContext vemc; |
@@ -701,7 +701,7 @@ find_validation_entry (const struct GNUNET_CRYPTO_EccPublicSignKey *public_key, | |||
701 | ve->public_key = *public_key; | 701 | ve->public_key = *public_key; |
702 | ve->pid = address->peer; | 702 | ve->pid = address->peer; |
703 | ve->pong_sig_valid_until = GNUNET_TIME_absolute_get_zero_(); | 703 | ve->pong_sig_valid_until = GNUNET_TIME_absolute_get_zero_(); |
704 | memset (&ve->pong_sig_cache, '\0', sizeof (struct GNUNET_CRYPTO_EccSignature)); | 704 | memset (&ve->pong_sig_cache, '\0', sizeof (struct GNUNET_CRYPTO_EddsaSignature)); |
705 | ve->latency = GNUNET_TIME_UNIT_FOREVER_REL; | 705 | ve->latency = GNUNET_TIME_UNIT_FOREVER_REL; |
706 | ve->challenge = | 706 | ve->challenge = |
707 | GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); | 707 | GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); |
@@ -733,7 +733,7 @@ add_valid_address (void *cls, const struct GNUNET_HELLO_Address *address, | |||
733 | struct ValidationEntry *ve; | 733 | struct ValidationEntry *ve; |
734 | struct GNUNET_PeerIdentity pid; | 734 | struct GNUNET_PeerIdentity pid; |
735 | struct GNUNET_ATS_Information ats; | 735 | struct GNUNET_ATS_Information ats; |
736 | struct GNUNET_CRYPTO_EccPublicSignKey public_key; | 736 | struct GNUNET_CRYPTO_EddsaPublicKey public_key; |
737 | 737 | ||
738 | if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us) | 738 | if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us) |
739 | return GNUNET_OK; /* expired */ | 739 | return GNUNET_OK; /* expired */ |
@@ -855,7 +855,7 @@ GST_validation_stop () | |||
855 | */ | 855 | */ |
856 | static void | 856 | static void |
857 | multicast_pong (void *cls, | 857 | multicast_pong (void *cls, |
858 | const struct GNUNET_CRYPTO_EccPublicSignKey *public_key, | 858 | const struct GNUNET_CRYPTO_EddsaPublicKey *public_key, |
859 | struct GNUNET_TIME_Absolute valid_until, | 859 | struct GNUNET_TIME_Absolute valid_until, |
860 | struct GNUNET_TIME_Absolute validation_block, | 860 | struct GNUNET_TIME_Absolute validation_block, |
861 | const struct GNUNET_HELLO_Address *address) | 861 | const struct GNUNET_HELLO_Address *address) |
@@ -901,7 +901,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender, | |||
901 | const struct TransportPingMessage *ping; | 901 | const struct TransportPingMessage *ping; |
902 | struct TransportPongMessage *pong; | 902 | struct TransportPongMessage *pong; |
903 | struct GNUNET_TRANSPORT_PluginFunctions *papi; | 903 | struct GNUNET_TRANSPORT_PluginFunctions *papi; |
904 | struct GNUNET_CRYPTO_EccSignature *sig_cache; | 904 | struct GNUNET_CRYPTO_EddsaSignature *sig_cache; |
905 | struct GNUNET_TIME_Absolute *sig_cache_exp; | 905 | struct GNUNET_TIME_Absolute *sig_cache_exp; |
906 | const char *addr; | 906 | const char *addr; |
907 | const char *addrend; | 907 | const char *addrend; |
@@ -1022,7 +1022,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender, | |||
1022 | { | 1022 | { |
1023 | addrend = NULL; /* make gcc happy */ | 1023 | addrend = NULL; /* make gcc happy */ |
1024 | slen = 0; | 1024 | slen = 0; |
1025 | static struct GNUNET_CRYPTO_EccSignature no_address_signature; | 1025 | static struct GNUNET_CRYPTO_EddsaSignature no_address_signature; |
1026 | static struct GNUNET_TIME_Absolute no_address_signature_expiration; | 1026 | static struct GNUNET_TIME_Absolute no_address_signature_expiration; |
1027 | 1027 | ||
1028 | sig_cache = &no_address_signature; | 1028 | sig_cache = &no_address_signature; |
@@ -1063,7 +1063,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender, | |||
1063 | *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME); | 1063 | *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME); |
1064 | pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp); | 1064 | pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp); |
1065 | if (GNUNET_OK != | 1065 | if (GNUNET_OK != |
1066 | GNUNET_CRYPTO_ecc_sign (GST_my_private_key, &pong->purpose, | 1066 | GNUNET_CRYPTO_eddsa_sign (GST_my_private_key, &pong->purpose, |
1067 | sig_cache)) | 1067 | sig_cache)) |
1068 | { | 1068 | { |
1069 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1069 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -1141,7 +1141,7 @@ struct ValidateAddressContext | |||
1141 | /** | 1141 | /** |
1142 | * Public key of the peer whose address is being validated. | 1142 | * Public key of the peer whose address is being validated. |
1143 | */ | 1143 | */ |
1144 | struct GNUNET_CRYPTO_EccPublicSignKey public_key; | 1144 | struct GNUNET_CRYPTO_EddsaPublicKey public_key; |
1145 | }; | 1145 | }; |
1146 | 1146 | ||
1147 | 1147 | ||
@@ -1274,7 +1274,7 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, | |||
1274 | { | 1274 | { |
1275 | /* We have a cached and valid signature for this peer, | 1275 | /* We have a cached and valid signature for this peer, |
1276 | * try to compare instead of verify */ | 1276 | * try to compare instead of verify */ |
1277 | if (0 == memcmp (&ve->pong_sig_cache, &pong->signature, sizeof (struct GNUNET_CRYPTO_EccSignature))) | 1277 | if (0 == memcmp (&ve->pong_sig_cache, &pong->signature, sizeof (struct GNUNET_CRYPTO_EddsaSignature))) |
1278 | { | 1278 | { |
1279 | /* signatures are identical, we can skip verification */ | 1279 | /* signatures are identical, we can skip verification */ |
1280 | sig_res = GNUNET_OK; | 1280 | sig_res = GNUNET_OK; |
@@ -1290,7 +1290,7 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, | |||
1290 | if (GNUNET_YES == do_verify) | 1290 | if (GNUNET_YES == do_verify) |
1291 | { | 1291 | { |
1292 | /* Do expensive verification */ | 1292 | /* Do expensive verification */ |
1293 | sig_res = GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, | 1293 | sig_res = GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, |
1294 | &pong->purpose, &pong->signature, | 1294 | &pong->purpose, &pong->signature, |
1295 | &ve->public_key); | 1295 | &ve->public_key); |
1296 | if (sig_res == GNUNET_SYSERR) | 1296 | if (sig_res == GNUNET_SYSERR) |
diff --git a/src/transport/gnunet-service-transport_validation.h b/src/transport/gnunet-service-transport_validation.h index c935b97cf..3408f50bb 100644 --- a/src/transport/gnunet-service-transport_validation.h +++ b/src/transport/gnunet-service-transport_validation.h | |||
@@ -134,7 +134,7 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello); | |||
134 | */ | 134 | */ |
135 | typedef void (*GST_ValidationAddressCallback) (void *cls, | 135 | typedef void (*GST_ValidationAddressCallback) (void *cls, |
136 | const struct | 136 | const struct |
137 | GNUNET_CRYPTO_EccPublicSignKey *public_key, | 137 | GNUNET_CRYPTO_EddsaPublicKey *public_key, |
138 | struct GNUNET_TIME_Absolute | 138 | struct GNUNET_TIME_Absolute |
139 | valid_until, | 139 | valid_until, |
140 | struct GNUNET_TIME_Absolute | 140 | struct GNUNET_TIME_Absolute |
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index cbda8ac6e..ed47e29e1 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -809,7 +809,7 @@ testservice_task (void *cls, | |||
809 | } | 809 | } |
810 | 810 | ||
811 | if ( (NULL != cpid) && | 811 | if ( (NULL != cpid) && |
812 | (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string (cpid, | 812 | (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (cpid, |
813 | strlen (cpid), | 813 | strlen (cpid), |
814 | &pid.public_key))) | 814 | &pid.public_key))) |
815 | { | 815 | { |
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 15a0be297..9e4e54e67 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -1013,7 +1013,7 @@ server_parse_url (struct HTTP_Server_Plugin *plugin, | |||
1013 | return GNUNET_SYSERR; | 1013 | return GNUNET_SYSERR; |
1014 | } | 1014 | } |
1015 | if (GNUNET_OK != | 1015 | if (GNUNET_OK != |
1016 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (target_start, | 1016 | GNUNET_CRYPTO_eddsa_public_key_from_string (target_start, |
1017 | hash_length, | 1017 | hash_length, |
1018 | &target->public_key)) | 1018 | &target->public_key)) |
1019 | { | 1019 | { |
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index ba16d539d..98806fbb8 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c | |||
@@ -49,7 +49,7 @@ static struct GNUNET_PeerIdentity my_identity; | |||
49 | /** | 49 | /** |
50 | * Our private key. | 50 | * Our private key. |
51 | */ | 51 | */ |
52 | static struct GNUNET_CRYPTO_EccPrivateKey *my_private_key; | 52 | static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key; |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * Our configuration. | 55 | * Our configuration. |
@@ -617,7 +617,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
617 | 617 | ||
618 | 618 | ||
619 | max_connect_per_transport = (uint32_t) tneigh; | 619 | max_connect_per_transport = (uint32_t) tneigh; |
620 | my_private_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 620 | my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile); |
621 | GNUNET_free (keyfile); | 621 | GNUNET_free (keyfile); |
622 | if (NULL == my_private_key) | 622 | if (NULL == my_private_key) |
623 | { | 623 | { |
@@ -626,7 +626,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
626 | end_badly_now (); | 626 | end_badly_now (); |
627 | return; | 627 | return; |
628 | } | 628 | } |
629 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (my_private_key, &my_identity.public_key); | 629 | GNUNET_CRYPTO_eddsa_key_get_public (my_private_key, &my_identity.public_key); |
630 | 630 | ||
631 | hello = GNUNET_HELLO_create (&my_identity.public_key, NULL, NULL, GNUNET_NO); | 631 | hello = GNUNET_HELLO_create (&my_identity.public_key, NULL, NULL, GNUNET_NO); |
632 | 632 | ||