5 files changed, 35 insertions, 35 deletions

diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c
index 750fdce16..d8006c4fc 100644
--- a/src/psycstore/plugin_psycstore_sqlite.c
+++ b/src/psycstore/plugin_psycstore_sqlite.c
@@ -609,7 +609,7 @@ database_shutdown (struct Plugin *plugin)
 
 static int
 channel_key_store (struct Plugin *plugin,
-                   const struct GNUNET_CRYPTO_EccPublicKey *channel_key)
+                   const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key)
 {
   sqlite3_stmt *stmt = plugin->insert_channel_key;
 
@@ -638,7 +638,7 @@ channel_key_store (struct Plugin *plugin,
 
 static int
 slave_key_store (struct Plugin *plugin,
-                 const struct GNUNET_CRYPTO_EccPublicKey *slave_key)
+                 const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key)
 {
   sqlite3_stmt *stmt = plugin->insert_slave_key;
 
@@ -676,8 +676,8 @@ slave_key_store (struct Plugin *plugin,
  */
 static int
 membership_store (void *cls,
-                  const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
-                  const struct GNUNET_CRYPTO_EccPublicKey *slave_key,
+                  const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
+                  const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
                   int did_join,
                   uint64_t announced_at,
                   uint64_t effective_since,
@@ -736,8 +736,8 @@ membership_store (void *cls,
  */
 static int
 membership_test (void *cls,
-                 const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
-                 const struct GNUNET_CRYPTO_EccPublicKey *slave_key,
+                 const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
+                 const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
                  uint64_t message_id)
 {
   struct Plugin *plugin = cls;
@@ -783,7 +783,7 @@ membership_test (void *cls,
  */
 static int
 fragment_store (void *cls,
-                const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+                const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                 const struct GNUNET_MULTICAST_MessageHeader *msg,
                 uint32_t psycstore_flags)
 {
@@ -847,7 +847,7 @@ fragment_store (void *cls,
  */
 static int
 message_add_flags (void *cls,
-                   const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+                   const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                    uint64_t message_id,
                    uint64_t psycstore_flags)
 {
@@ -923,7 +923,7 @@ fragment_row (sqlite3_stmt *stmt, GNUNET_PSYCSTORE_FragmentCallback cb,
 static int
 fragment_get (void *cls,
               const struct
-              GNUNET_CRYPTO_EccPublicKey *channel_key,
+              GNUNET_CRYPTO_EccPublicSignKey *channel_key,
               uint64_t fragment_id,
               GNUNET_PSYCSTORE_FragmentCallback cb,
               void *cb_cls)
@@ -974,7 +974,7 @@ fragment_get (void *cls,
  */
 static int
 message_get (void *cls,
-             const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+             const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
              uint64_t message_id,
              GNUNET_PSYCSTORE_FragmentCallback cb,
              void *cb_cls)
@@ -1035,7 +1035,7 @@ message_get (void *cls,
  */
 static int
 message_get_fragment (void *cls,
-                      const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+                      const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                       uint64_t message_id,
                       uint64_t fragment_offset,
                       GNUNET_PSYCSTORE_FragmentCallback cb,
@@ -1089,7 +1089,7 @@ message_get_fragment (void *cls,
  */
 static int
 counters_get_master (void *cls,
-                     const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+                     const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                      uint64_t *fragment_id,
                      uint64_t *message_id,
                      uint64_t *group_generation)
@@ -1142,7 +1142,7 @@ counters_get_master (void *cls,
  */
 static int
 counters_get_slave (void *cls,
-                    const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+                    const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                     uint64_t *max_state_msg_id)
 {
   struct Plugin *plugin = cls;
@@ -1193,7 +1193,7 @@ counters_get_slave (void *cls,
  */
 static int
 state_set (void *cls,
-           const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+           const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
            const char *name, const void *value, size_t value_size)
 {
   struct Plugin *plugin = cls;
@@ -1242,7 +1242,7 @@ state_set (void *cls,
  * @return #GNUNET_OK on success, else #GNUNET_SYSERR
  */
 static int
-state_reset (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *channel_key)
+state_reset (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt = plugin->delete_state;
@@ -1279,7 +1279,7 @@ state_reset (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *channel_key)
  */
 static int
 state_update_signed (void *cls,
-                     const struct GNUNET_CRYPTO_EccPublicKey *channel_key)
+                     const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt = plugin->update_state_signed;
@@ -1315,7 +1315,7 @@ state_update_signed (void *cls,
  * @return #GNUNET_OK on success, else #GNUNET_SYSERR
  */
 static int
-state_get (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+state_get (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
            const char *name, GNUNET_PSYCSTORE_StateCallback cb, void *cb_cls)
 {
   struct Plugin *plugin = cls;
@@ -1367,7 +1367,7 @@ state_get (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
  * @return #GNUNET_OK on success, else #GNUNET_SYSERR
  */
 static int
-state_get_all (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+state_get_all (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                const char *name, GNUNET_PSYCSTORE_StateCallback cb,
                void *cb_cls)
 {
@@ -1435,7 +1435,7 @@ state_get_all (void *cls, const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
  */
 static int
 state_get_signed (void *cls,
-                  const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
+                  const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                   GNUNET_PSYCSTORE_StateCallback cb, void *cb_cls)
 {
   struct Plugin *plugin = cls;
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 2e3d66ec5..d2c25e791 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -58,8 +58,8 @@ struct ResultCodeMessage
  */
 struct MembershipStoreMessage
 {
-  const struct GNUNET_CRYPTO_EccPublicKey *channel_key;
-  const struct GNUNET_CRYPTO_EccPublicKey *slave_key;
+  const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key;
+  const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key;
   int did_join;
   uint64_t announced_at;
   uint64_t effective_since;
@@ -72,8 +72,8 @@ struct MembershipStoreMessage
  */
 struct MembershipTestMessage
 {
-  const struct GNUNET_CRYPTO_EccPublicKey *channel_key;
-  const struct GNUNET_CRYPTO_EccPublicKey *slave_key;
+  const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key;
+  const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key;
   uint64_t message_id;
   uint64_t group_generation;
 };
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index 194dcc79e..5847fc852 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -437,8 +437,8 @@ GNUNET_PSYCSTORE_operation_cancel (struct GNUNET_PSYCSTORE_OperationHandle *op)
 struct GNUNET_PSYCSTORE_OperationHandle *
 GNUNET_PSYCSTORE_membership_store (
   struct GNUNET_PSYCSTORE_Handle *h,
-  const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
-  const struct GNUNET_CRYPTO_EccPublicKey *slave_key,
+  const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
+  const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
   int did_join,
   uint64_t announced_at,
   uint64_t effective_since,
@@ -453,8 +453,8 @@ GNUNET_PSYCSTORE_membership_store (
 struct GNUNET_PSYCSTORE_OperationHandle *
 GNUNET_PSYCSTORE_membership_test (
   struct GNUNET_PSYCSTORE_Handle *h,
-  const struct GNUNET_CRYPTO_EccPublicKey *channel_key,
-  const struct GNUNET_CRYPTO_EccPublicKey *slave_key,
+  const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
+  const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
   uint64_t message_id,
   uint64_t group_generation,
   GNUNET_PSYCSTORE_ResultCallback rcb,
diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c
index 52a306f07..b584ed51d 100644
--- a/src/psycstore/test_plugin_psycstore.c
+++ b/src/psycstore/test_plugin_psycstore.c
@@ -53,8 +53,8 @@ static const char *plugin_name;
 static struct GNUNET_CRYPTO_EccPrivateKey *channel_key;
 static struct GNUNET_CRYPTO_EccPrivateKey *slave_key;
 
-static struct GNUNET_CRYPTO_EccPublicKey channel_pub_key;
-static struct GNUNET_CRYPTO_EccPublicKey slave_pub_key;
+static struct GNUNET_CRYPTO_EccPublicSignKey channel_pub_key;
+static struct GNUNET_CRYPTO_EccPublicSignKey slave_pub_key;
 
 /**
  * Function called when the service shuts down.  Unloads our psycstore
@@ -174,8 +174,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   channel_key = GNUNET_CRYPTO_ecc_key_create ();
   slave_key = GNUNET_CRYPTO_ecc_key_create ();
 
-  GNUNET_CRYPTO_ecc_key_get_public (channel_key, &channel_pub_key);
-  GNUNET_CRYPTO_ecc_key_get_public (slave_key, &slave_pub_key);
+  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);
 
   ASSERT (GNUNET_OK == db->membership_store(db->cls, &channel_pub_key,
                                             &slave_pub_key, GNUNET_YES,
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index 6b9e77180..db4cfb0eb 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -58,8 +58,8 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 static struct GNUNET_CRYPTO_EccPrivateKey *channel_key;
 static struct GNUNET_CRYPTO_EccPrivateKey *slave_key;
 
-static struct GNUNET_CRYPTO_EccPublicKey channel_pub_key;
-static struct GNUNET_CRYPTO_EccPublicKey slave_pub_key;
+static struct GNUNET_CRYPTO_EccPublicSignKey channel_pub_key;
+static struct GNUNET_CRYPTO_EccPublicSignKey slave_pub_key;
 
 /**
  * Clean up all resources used.
@@ -160,8 +160,8 @@ run (void *cls,
   channel_key = GNUNET_CRYPTO_ecc_key_create ();
   slave_key = GNUNET_CRYPTO_ecc_key_create ();
 
-  GNUNET_CRYPTO_ecc_key_get_public (channel_key, &channel_pub_key);
-  GNUNET_CRYPTO_ecc_key_get_public (slave_key, &slave_pub_key);
+  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);
 
   op = GNUNET_PSYCSTORE_membership_store (h, &channel_pub_key, &slave_pub_key,
                                           GNUNET_YES, 2, 2, 1,