diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-11 11:38:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-11 11:38:57 +0000 |
commit | 59bab1b08e5305cffa0ce8075014e65a93f5ae52 (patch) | |
tree | 2cf3516cb76d9dca6a1dd0cbf3c36533abef1e25 /src/psyc/test_psyc.c | |
parent | 65cfef23df7a5ec3f86f0966b29b399fc0e5e5c7 (diff) | |
download | gnunet-59bab1b08e5305cffa0ce8075014e65a93f5ae52.tar.gz gnunet-59bab1b08e5305cffa0ce8075014e65a93f5ae52.zip |
-fix eddsa ftbfs
Diffstat (limited to 'src/psyc/test_psyc.c')
-rw-r--r-- | src/psyc/test_psyc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 1d7035a87..80497d8ba 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c | |||
@@ -54,11 +54,11 @@ static struct GNUNET_PSYC_Master *mst; | |||
54 | static struct GNUNET_PSYC_Slave *slv; | 54 | static struct GNUNET_PSYC_Slave *slv; |
55 | static struct GNUNET_PSYC_Channel *ch; | 55 | static struct GNUNET_PSYC_Channel *ch; |
56 | 56 | ||
57 | static struct GNUNET_CRYPTO_EccPrivateKey *channel_key; | 57 | static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key; |
58 | static struct GNUNET_CRYPTO_EccPrivateKey *slave_key; | 58 | static struct GNUNET_CRYPTO_EddsaPrivateKey *slave_key; |
59 | 59 | ||
60 | static struct GNUNET_CRYPTO_EccPublicSignKey channel_pub_key; | 60 | static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key; |
61 | static struct GNUNET_CRYPTO_EccPublicSignKey slave_pub_key; | 61 | static struct GNUNET_CRYPTO_EddsaPublicKey slave_pub_key; |
62 | 62 | ||
63 | struct GNUNET_PSYC_MasterTransmitHandle *mth; | 63 | struct GNUNET_PSYC_MasterTransmitHandle *mth; |
64 | 64 | ||
@@ -122,7 +122,7 @@ end () | |||
122 | 122 | ||
123 | 123 | ||
124 | static int | 124 | static int |
125 | method (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, | 125 | method (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key, |
126 | uint64_t message_id, const char *name, | 126 | uint64_t message_id, const char *name, |
127 | size_t modifier_count, const struct GNUNET_ENV_Modifier *modifiers, | 127 | size_t modifier_count, const struct GNUNET_ENV_Modifier *modifiers, |
128 | uint64_t data_offset, const void *data, size_t data_size, | 128 | uint64_t data_offset, const void *data, size_t data_size, |
@@ -136,7 +136,7 @@ method (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, | |||
136 | 136 | ||
137 | 137 | ||
138 | static int | 138 | static int |
139 | join (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, | 139 | join (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key, |
140 | const char *method_name, | 140 | const char *method_name, |
141 | size_t variable_count, const struct GNUNET_ENV_Modifier *variables, | 141 | size_t variable_count, const struct GNUNET_ENV_Modifier *variables, |
142 | const void *data, size_t data_size, struct GNUNET_PSYC_JoinHandle *jh) | 142 | const void *data, size_t data_size, struct GNUNET_PSYC_JoinHandle *jh) |
@@ -243,8 +243,8 @@ run (void *cls, | |||
243 | channel_key = GNUNET_CRYPTO_ecc_key_create (); | 243 | channel_key = GNUNET_CRYPTO_ecc_key_create (); |
244 | slave_key = GNUNET_CRYPTO_ecc_key_create (); | 244 | slave_key = GNUNET_CRYPTO_ecc_key_create (); |
245 | 245 | ||
246 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (channel_key, &channel_pub_key); | 246 | GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key); |
247 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (slave_key, &slave_pub_key); | 247 | GNUNET_CRYPTO_eddsa_key_get_public (slave_key, &slave_pub_key); |
248 | 248 | ||
249 | mst = GNUNET_PSYC_master_start (cfg, channel_key, | 249 | mst = GNUNET_PSYC_master_start (cfg, channel_key, |
250 | GNUNET_PSYC_CHANNEL_PRIVATE, | 250 | GNUNET_PSYC_CHANNEL_PRIVATE, |