[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30132 - gnunet/src/psyc
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30132 - gnunet/src/psyc |
|
Date: |
Fri, 11 Oct 2013 13:38:57 +0200 |
Author: grothoff
Date: 2013-10-11 13:38:57 +0200 (Fri, 11 Oct 2013)
New Revision: 30132
Modified:
gnunet/src/psyc/gnunet-service-psyc.c
gnunet/src/psyc/psyc.h
gnunet/src/psyc/psyc_api.c
gnunet/src/psyc/test_psyc.c
Log:
-fix eddsa ftbfs
Modified: gnunet/src/psyc/gnunet-service-psyc.c
===================================================================
--- gnunet/src/psyc/gnunet-service-psyc.c 2013-10-11 11:22:17 UTC (rev
30131)
+++ gnunet/src/psyc/gnunet-service-psyc.c 2013-10-11 11:38:57 UTC (rev
30132)
@@ -100,8 +100,8 @@
struct Master
{
struct Channel channel;
- struct GNUNET_CRYPTO_EccPrivateKey priv_key;
- struct GNUNET_CRYPTO_EccPublicSignKey pub_key;
+ struct GNUNET_CRYPTO_EddsaPrivateKey priv_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey pub_key;
struct GNUNET_HashCode pub_key_hash;
struct GNUNET_MULTICAST_Origin *origin;
@@ -124,8 +124,8 @@
struct Slave
{
struct Channel channel;
- struct GNUNET_CRYPTO_EccPrivateKey slave_key;
- struct GNUNET_CRYPTO_EccPublicSignKey chan_key;
+ struct GNUNET_CRYPTO_EddsaPrivateKey slave_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey chan_key;
struct GNUNET_HashCode chan_key_hash;
struct GNUNET_MULTICAST_Member *member;
@@ -215,7 +215,7 @@
}
void
-join_cb (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *member_key,
+join_cb (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *member_key,
const struct GNUNET_MessageHeader *join_req,
struct GNUNET_MULTICAST_JoinHandle *jh)
{
@@ -224,7 +224,7 @@
void
membership_test_cb (void *cls,
- const struct GNUNET_CRYPTO_EccPublicSignKey *member_key,
+ const struct GNUNET_CRYPTO_EddsaPublicKey *member_key,
uint64_t message_id, uint64_t group_generation,
struct GNUNET_MULTICAST_MembershipTestHandle *mth)
{
@@ -233,7 +233,7 @@
void
replay_fragment_cb (void *cls,
- const struct GNUNET_CRYPTO_EccPublicSignKey *member_key,
+ const struct GNUNET_CRYPTO_EddsaPublicKey *member_key,
uint64_t fragment_id, uint64_t flags,
struct GNUNET_MULTICAST_ReplayHandle *rh)
{
@@ -242,7 +242,7 @@
void
replay_message_cb (void *cls,
- const struct GNUNET_CRYPTO_EccPublicSignKey *member_key,
+ const struct GNUNET_CRYPTO_EddsaPublicKey *member_key,
uint64_t message_id,
uint64_t fragment_offset,
uint64_t flags,
@@ -252,7 +252,7 @@
}
void
-request_cb (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *member_key,
+request_cb (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *member_key,
const struct GNUNET_MessageHeader *req,
enum GNUNET_MULTICAST_MessageFlags flags)
{
@@ -343,7 +343,7 @@
mst->channel.is_master = GNUNET_YES;
mst->policy = ntohl (req->policy);
mst->priv_key = req->channel_key;
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (&mst->priv_key,
+ GNUNET_CRYPTO_eddsa_key_get_public (&mst->priv_key,
&mst->pub_key);
GNUNET_CRYPTO_hash (&mst->pub_key, sizeof (mst->pub_key),
&mst->pub_key_hash);
Modified: gnunet/src/psyc/psyc.h
===================================================================
--- gnunet/src/psyc/psyc.h 2013-10-11 11:22:17 UTC (rev 30131)
+++ gnunet/src/psyc/psyc.h 2013-10-11 11:38:57 UTC (rev 30132)
@@ -107,7 +107,7 @@
*/
struct GNUNET_MessageHeader header;
- struct GNUNET_CRYPTO_EccPrivateKey channel_key;
+ struct GNUNET_CRYPTO_EddsaPrivateKey channel_key;
uint32_t policy GNUNET_PACKED;
};
@@ -122,9 +122,9 @@
uint32_t relay_count GNUNET_PACKED;
- struct GNUNET_CRYPTO_EccPublicSignKey channel_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey channel_key;
- struct GNUNET_CRYPTO_EccPrivateKey slave_key;
+ struct GNUNET_CRYPTO_EddsaPrivateKey slave_key;
struct GNUNET_PeerIdentity origin;
@@ -141,7 +141,7 @@
uint32_t reserved;
- struct GNUNET_CRYPTO_EccPublicSignKey *slave_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey *slave_key;
uint64_t announced_at;
@@ -158,7 +158,7 @@
uint32_t reserved;
- struct GNUNET_CRYPTO_EccPublicSignKey *slave_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey *slave_key;
uint64_t announced_at;
};
Modified: gnunet/src/psyc/psyc_api.c
===================================================================
--- gnunet/src/psyc/psyc_api.c 2013-10-11 11:22:17 UTC (rev 30131)
+++ gnunet/src/psyc/psyc_api.c 2013-10-11 11:38:57 UTC (rev 30132)
@@ -551,7 +551,7 @@
*/
struct GNUNET_PSYC_Master *
GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_CRYPTO_EccPrivateKey
*channel_key,
+ const struct GNUNET_CRYPTO_EddsaPrivateKey
*channel_key,
enum GNUNET_PSYC_Policy policy,
GNUNET_PSYC_Method method,
GNUNET_PSYC_JoinCallback join_cb,
@@ -768,8 +768,8 @@
*/
struct GNUNET_PSYC_Slave *
GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_CRYPTO_EccPublicSignKey
*channel_key,
- const struct GNUNET_CRYPTO_EccPrivateKey *slave_key,
+ const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
+ const struct GNUNET_CRYPTO_EddsaPrivateKey *slave_key,
const struct GNUNET_PeerIdentity *origin,
uint32_t relay_count,
const struct GNUNET_PeerIdentity *relays,
@@ -921,7 +921,7 @@
*/
void
GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *ch,
- const struct GNUNET_CRYPTO_EccPublicSignKey
+ const struct GNUNET_CRYPTO_EddsaPublicKey
*slave_key,
uint64_t announced_at,
uint64_t effective_since)
@@ -964,7 +964,7 @@
*/
void
GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *ch,
- const struct GNUNET_CRYPTO_EccPublicSignKey
+ const struct GNUNET_CRYPTO_EddsaPublicKey
*slave_key,
uint64_t announced_at)
{
Modified: gnunet/src/psyc/test_psyc.c
===================================================================
--- gnunet/src/psyc/test_psyc.c 2013-10-11 11:22:17 UTC (rev 30131)
+++ gnunet/src/psyc/test_psyc.c 2013-10-11 11:38:57 UTC (rev 30132)
@@ -54,11 +54,11 @@
static struct GNUNET_PSYC_Slave *slv;
static struct GNUNET_PSYC_Channel *ch;
-static struct GNUNET_CRYPTO_EccPrivateKey *channel_key;
-static struct GNUNET_CRYPTO_EccPrivateKey *slave_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *slave_key;
-static struct GNUNET_CRYPTO_EccPublicSignKey channel_pub_key;
-static struct GNUNET_CRYPTO_EccPublicSignKey slave_pub_key;
+static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key;
+static struct GNUNET_CRYPTO_EddsaPublicKey slave_pub_key;
struct GNUNET_PSYC_MasterTransmitHandle *mth;
@@ -122,7 +122,7 @@
static int
-method (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
+method (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key,
uint64_t message_id, const char *name,
size_t modifier_count, const struct GNUNET_ENV_Modifier *modifiers,
uint64_t data_offset, const void *data, size_t data_size,
@@ -136,7 +136,7 @@
static int
-join (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
+join (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key,
const char *method_name,
size_t variable_count, const struct GNUNET_ENV_Modifier *variables,
const void *data, size_t data_size, struct GNUNET_PSYC_JoinHandle *jh)
@@ -243,8 +243,8 @@
channel_key = GNUNET_CRYPTO_ecc_key_create ();
slave_key = GNUNET_CRYPTO_ecc_key_create ();
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (channel_key,
&channel_pub_key);
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (slave_key, &slave_pub_key);
+ GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key);
+ GNUNET_CRYPTO_eddsa_key_get_public (slave_key, &slave_pub_key);
mst = GNUNET_PSYC_master_start (cfg, channel_key,
GNUNET_PSYC_CHANNEL_PRIVATE,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30132 - gnunet/src/psyc,
gnunet <=