5 files changed, 45 insertions, 42 deletions

diff --git a/src/revocation/gnunet-revocation-tvg.c b/src/revocation/gnunet-revocation-tvg.c
index 682f41530..a126709ce 100644
--- a/src/revocation/gnunet-revocation-tvg.c
+++ b/src/revocation/gnunet-revocation-tvg.c
@@ -115,14 +115,14 @@ run (void *cls,
   GNUNET_IDENTITY_key_get_public (&id_priv,
                                   &id_pub);
   GNUNET_STRINGS_data_to_string (&id_pub,
-                                 GNUNET_IDENTITY_key_get_length (&id_pub),
+                                 GNUNET_IDENTITY_public_key_get_length (&id_pub),
                                  ztld,
                                  sizeof (ztld));
   fprintf (stdout, "Zone private key (d, big-endian scalar):\n");
   print_bytes_ (&id_priv.ecdsa_key, sizeof(id_priv.ecdsa_key), 8, 1);
   fprintf (stdout, "\n");
   fprintf (stdout, "Zone identifier (ztype|zkey):\n");
-  key_len = GNUNET_IDENTITY_key_get_length (&id_pub);
+  key_len = GNUNET_IDENTITY_public_key_get_length (&id_pub);
   GNUNET_assert (0 < key_len);
   print_bytes (&id_pub, key_len, 8);
   fprintf (stdout, "\n");
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c
index a7f96385c..853ca0f71 100644
--- a/src/revocation/gnunet-revocation.c
+++ b/src/revocation/gnunet-revocation.c
@@ -343,7 +343,7 @@ ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego)
               GNUNET_DISK_fn_read (filename, proof_of_work,
                                    GNUNET_REVOCATION_MAX_PROOF_SIZE))))
   {
-    ssize_t ksize = GNUNET_IDENTITY_key_get_length (&key);
+    ssize_t ksize = GNUNET_IDENTITY_public_key_get_length (&key);
     if (0 > ksize)
     {
       fprintf (stderr,
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c
index 4494ade83..fe74201f3 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -316,7 +316,7 @@ publicize_rm (const struct RevokeMessage *rm)
   const struct GNUNET_IDENTITY_PublicKey *pk
     = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
 
-  pklen = GNUNET_IDENTITY_key_get_length (pk);
+  pklen = GNUNET_IDENTITY_public_key_get_length (pk);
   if (0 > pklen)
   {
     GNUNET_break_op (0);
@@ -950,7 +950,7 @@ run (void *cls,
                                           GNUNET_REVOCATION_PowP *) &rm[1];
     ssize_t ksize;
     pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
-    ksize = GNUNET_IDENTITY_key_get_length (pk);
+    ksize = GNUNET_IDENTITY_public_key_get_length (pk);
     if (0 > ksize)
     {
       GNUNET_break_op (0);
diff --git a/src/revocation/plugin_block_revocation.c b/src/revocation/plugin_block_revocation.c
index 12ec555e4..0c81440eb 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/revocation/plugin_block_revocation.c
@@ -56,10 +56,10 @@ struct InternalContext
  */
 static enum GNUNET_GenericReturnValue
 block_plugin_revocation_check_query (void *cls,
-                                    enum GNUNET_BLOCK_Type type,
-                                    const struct GNUNET_HashCode *query,
-                                    const void *xquery,
-                                    size_t xquery_size)
+                                     enum GNUNET_BLOCK_Type type,
+                                     const struct GNUNET_HashCode *query,
+                                     const void *xquery,
+                                     size_t xquery_size)
 {
   (void) cls;
   (void) query;
@@ -86,16 +86,16 @@ block_plugin_revocation_check_query (void *cls,
  */
 static enum GNUNET_GenericReturnValue
 block_plugin_revocation_check_block (void *cls,
-                                    enum GNUNET_BLOCK_Type type,
-                                    const void *block,
-                                    size_t block_size)
+                                     enum GNUNET_BLOCK_Type type,
+                                     const void *block,
+                                     size_t block_size)
 {
   struct InternalContext *ic = cls;
   const struct RevokeMessage *rm = block;
   const struct GNUNET_REVOCATION_PowP *pow
     = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
   struct GNUNET_IDENTITY_PublicKey pk;
-  ssize_t pklen;
+  size_t pklen;
   size_t left;
 
   if (GNUNET_BLOCK_TYPE_REVOCATION != type)
@@ -114,9 +114,10 @@ block_plugin_revocation_check_block (void *cls,
     return GNUNET_NO;
   }
   left = block_size - sizeof (*rm) - sizeof (*pow);
-  pklen = GNUNET_IDENTITY_read_key_from_buffer (&pk,
-                                                &pow[1],
-                                                left);
+  GNUNET_IDENTITY_read_public_key_from_buffer (&pow[1],
+                                               left,
+                                               &pk,
+                                               &pklen);
   if (0 > pklen)
   {
     GNUNET_break_op (0);
@@ -152,14 +153,14 @@ block_plugin_revocation_check_block (void *cls,
  */
 static enum GNUNET_BLOCK_ReplyEvaluationResult
 block_plugin_revocation_check_reply (
-                                     void *cls,
-                                     enum GNUNET_BLOCK_Type type,
-                                    struct GNUNET_BLOCK_Group *group,
-                                    const struct GNUNET_HashCode *query,
-                                    const void *xquery,
-                                    size_t xquery_size,
-                                    const void *reply_block,
-                                    size_t reply_block_size)
+  void *cls,
+  enum GNUNET_BLOCK_Type type,
+  struct GNUNET_BLOCK_Group *group,
+  const struct GNUNET_HashCode *query,
+  const void *xquery,
+  size_t xquery_size,
+  const void *reply_block,
+  size_t reply_block_size)
 {
   (void) cls;
   (void) group;
@@ -199,7 +200,7 @@ block_plugin_revocation_get_key (void *cls,
   const struct GNUNET_REVOCATION_PowP *pow
     = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
   struct GNUNET_IDENTITY_PublicKey pk;
-  ssize_t pklen;
+  size_t pklen;
   size_t left;
 
   if (GNUNET_BLOCK_TYPE_REVOCATION != type)
@@ -218,9 +219,10 @@ block_plugin_revocation_get_key (void *cls,
     return GNUNET_NO;
   }
   left = block_size - sizeof (*rm) - sizeof (*pow);
-  pklen = GNUNET_IDENTITY_read_key_from_buffer (&pk,
-                                                &pow[1],
-                                                left);
+  GNUNET_IDENTITY_read_public_key_from_buffer (&pow[1],
+                                               left,
+                                               &pk,
+                                               &pklen);
   if (0 > pklen)
   {
     GNUNET_break_op (0);
@@ -242,7 +244,7 @@ void *
 libgnunet_plugin_block_revocation_init (void *cls)
 {
   static const enum GNUNET_BLOCK_Type types[] = {
-                                                 GNUNET_BLOCK_TYPE_REVOCATION,
+    GNUNET_BLOCK_TYPE_REVOCATION,
     GNUNET_BLOCK_TYPE_ANY       /* end of list */
   };
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 78b3c083a..34b4eddd7 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -407,14 +407,14 @@ REV_create_signature_message (const struct GNUNET_REVOCATION_PowP *pow)
   size_t ksize;
 
   pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
-  ksize = GNUNET_IDENTITY_key_get_length (pk);
+  ksize = GNUNET_IDENTITY_public_key_get_length (pk);
   spurp = GNUNET_malloc (sizeof (*spurp) + ksize);
   spurp->timestamp = pow->timestamp;
   spurp->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_REVOCATION);
   spurp->purpose.size = htonl (sizeof(*spurp) + ksize);
-  GNUNET_IDENTITY_write_key_to_buffer (pk,
-                                       (char*) &spurp[1],
-                                       ksize);
+  GNUNET_IDENTITY_write_public_key_to_buffer (pk,
+                                              (char*) &spurp[1],
+                                              ksize);
   return spurp;
 }
 
@@ -426,14 +426,15 @@ check_signature_identity (const struct GNUNET_REVOCATION_PowP *pow,
   unsigned char *sig;
   size_t ksize;
 
-  ksize = GNUNET_IDENTITY_key_get_length (key);
+  ksize = GNUNET_IDENTITY_public_key_get_length (key);
   spurp = REV_create_signature_message (pow);
   sig = ((unsigned char*) &pow[1] + ksize);
   if (GNUNET_OK !=
-      GNUNET_IDENTITY_signature_verify_raw_ (GNUNET_SIGNATURE_PURPOSE_REVOCATION,
-                                             &spurp->purpose,
-                                             sig,
-                                             key))
+      GNUNET_IDENTITY_signature_verify_raw_ (
+        GNUNET_SIGNATURE_PURPOSE_REVOCATION,
+        &spurp->purpose,
+        sig,
+        key))
   {
     return GNUNET_SYSERR;
   }
@@ -503,7 +504,7 @@ GNUNET_REVOCATION_check_pow (const struct GNUNET_REVOCATION_PowP *pow,
   GNUNET_memcpy (&buf[sizeof(uint64_t)],
                  &pow->timestamp,
                  sizeof (uint64_t));
-  pklen = GNUNET_IDENTITY_key_get_length (pk);
+  pklen = GNUNET_IDENTITY_public_key_get_length (pk);
   if (0 > pklen)
   {
     GNUNET_break (0);
@@ -578,7 +579,7 @@ sign_pow_identity (const struct GNUNET_IDENTITY_PrivateKey *key,
   ts = GNUNET_TIME_absolute_subtract (ts,
                                       GNUNET_TIME_UNIT_WEEKS);
   pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
-  ksize = GNUNET_IDENTITY_key_get_length (pk);
+  ksize = GNUNET_IDENTITY_public_key_get_length (pk);
   pow->timestamp = GNUNET_TIME_absolute_hton (ts);
   rp = REV_create_signature_message (pow);
   sig = ((char*) &pow[1]) + ksize;
@@ -691,7 +692,7 @@ GNUNET_REVOCATION_pow_round (struct GNUNET_REVOCATION_PowCalculationHandle *pc)
   GNUNET_memcpy (&buf[sizeof(uint64_t)],
                  &pc->pow->timestamp,
                  sizeof (uint64_t));
-  ksize = GNUNET_IDENTITY_key_get_length (pk);
+  ksize = GNUNET_IDENTITY_public_key_get_length (pk);
   GNUNET_assert (0 < ksize);
   GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
                  pk,
@@ -749,7 +750,7 @@ GNUNET_REVOCATION_proof_get_size (const struct GNUNET_REVOCATION_PowP *pow)
 
   size = sizeof (struct GNUNET_REVOCATION_PowP);
   pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
-  ksize = GNUNET_IDENTITY_key_get_length (pk);
+  ksize = GNUNET_IDENTITY_public_key_get_length (pk);
   size += ksize;
   size += GNUNET_IDENTITY_signature_get_raw_length_by_type (pk->type);
   return size;