moving to new, fixed-size encoding of public and private ECC keys everywhere, also improving ECC API to better support ECRS/GADS operations

21 files changed, 114 insertions, 126 deletions

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 56e2859d0..50a8601f8 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -305,7 +305,7 @@ del_continuation (void *cls,
  */
 static void
 display_record (void *cls,
-                const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                 struct GNUNET_TIME_Absolute expire,                         
                 const char *name,
                 unsigned int rd_len,
@@ -396,7 +396,7 @@ sync_cb (void *cls)
  */
 static void
 get_existing_record (void *cls,
-                     const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                     const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                      struct GNUNET_TIME_Absolute freshness,                         
                      const char *rec_name,
                      unsigned int rd_count,
@@ -453,7 +453,7 @@ testservice_task (void *cls,
                   int result)
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
+  struct GNUNET_CRYPTO_EccPublicKey pub;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   if (GNUNET_YES != result)
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index f8663775b..a4e463642 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -283,10 +283,9 @@ write_key_to_file (const char *filename,
                    struct GNUNET_NAMESTORE_CryptoContainer *c)
 {
   struct GNUNET_CRYPTO_EccPrivateKey *ret = c->privkey;
-  struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *enc;
   struct GNUNET_DISK_FileHandle *fd;
   struct GNUNET_CRYPTO_ShortHashCode zone;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+  struct GNUNET_CRYPTO_EccPublicKey pubkey;
   struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
   fd = GNUNET_DISK_file_open (filename, 
@@ -305,7 +304,7 @@ write_key_to_file (const char *filename,
     }
     GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
     GNUNET_CRYPTO_short_hash (&pubkey, 
-                              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), 
+                              sizeof (struct GNUNET_CRYPTO_EccPublicKey), 
                               &zone);
     GNUNET_CRYPTO_ecc_key_free (privkey);
     if (0 == memcmp (&zone, &c->zone, sizeof(zone)))
@@ -326,17 +325,21 @@ write_key_to_file (const char *filename,
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "open", filename);
     return GNUNET_SYSERR;
   }
-  if (GNUNET_YES != GNUNET_DISK_file_lock (fd, 0, sizeof (struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded), GNUNET_YES))
+  if (GNUNET_YES != 
+      GNUNET_DISK_file_lock (fd, 0, 
+                             sizeof (struct GNUNET_CRYPTO_EccPrivateKey),
+                             GNUNET_YES))
   {
     GNUNET_break (GNUNET_YES == GNUNET_DISK_file_close (fd));
     return GNUNET_SYSERR;
   }
-  enc = GNUNET_CRYPTO_ecc_encode_key (ret);
-  GNUNET_assert (NULL != enc);
-  GNUNET_assert (ntohs (enc->size) == GNUNET_DISK_file_write (fd, enc, ntohs (enc->size)));
-  GNUNET_free (enc);
+  GNUNET_assert (sizeof (struct GNUNET_CRYPTO_EccPrivateKey) ==
+                 GNUNET_DISK_file_write (fd, ret,
+                                         sizeof (struct GNUNET_CRYPTO_EccPrivateKey)));
   GNUNET_DISK_file_sync (fd);
-  if (GNUNET_YES != GNUNET_DISK_file_unlock (fd, 0, sizeof (struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded)))
+  if (GNUNET_YES != 
+      GNUNET_DISK_file_unlock (fd, 0, 
+                               sizeof (struct GNUNET_CRYPTO_EccPrivateKey)))
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "fcntl", filename);
   GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -387,14 +390,14 @@ zone_to_disk_it (void *cls,
 static void
 learn_private_key (struct GNUNET_CRYPTO_EccPrivateKey *pkey)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
+  struct GNUNET_CRYPTO_EccPublicKey pub;
   struct GNUNET_HashCode long_hash;
   struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
   struct GNUNET_NAMESTORE_CryptoContainer *cc;
 
   GNUNET_CRYPTO_ecc_key_get_public (pkey, &pub);
   GNUNET_CRYPTO_short_hash (&pub,
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                             &pubkey_hash);
   GNUNET_CRYPTO_short_hash_double (&pubkey_hash, &long_hash);
 
@@ -643,7 +646,7 @@ struct LookupNameContext
  */
 static void
 handle_lookup_name_it (void *cls,
-                       const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                       const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                        struct GNUNET_TIME_Absolute expire,
                        const char *name,
                        unsigned int rd_count,
@@ -680,7 +683,7 @@ handle_lookup_name_it (void *cls,
   if (NULL != zone_key) 
   {
     GNUNET_CRYPTO_short_hash (zone_key, 
-                              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), 
+                              sizeof (struct GNUNET_CRYPTO_EccPublicKey), 
                               &zone_key_hash);
     GNUNET_CRYPTO_short_hash_double (&zone_key_hash, &long_hash);
     if (NULL != (cc = GNUNET_CONTAINER_multihashmap_get (zonekeys, &long_hash)))   
@@ -991,7 +994,7 @@ static void
 send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,                     
                       struct GNUNET_SERVER_Client *client,
                       uint32_t request_id,
-                      const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                      const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                       struct GNUNET_TIME_Absolute expire,
                       const char *name,
                       unsigned int rd_count,
@@ -1198,16 +1201,14 @@ handle_record_create (void *cls,
   size_t msg_size;
   size_t msg_size_exp;
   size_t rd_ser_len;
-  size_t key_len;
   uint32_t rid;
-  const char *pkey_tmp;
   const char *name_tmp;
   char *conv_name;
   const char *rd_ser;
   unsigned int rd_count;
   int res;
   struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+  struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
               "Received `%s' message\n", "NAMESTORE_RECORD_CREATE");
@@ -1229,8 +1230,8 @@ handle_record_create (void *cls,
   msg_size = ntohs (message->size);
   rd_count = ntohs (rp_msg->rd_count);
   rd_ser_len = ntohs (rp_msg->rd_len);
-  key_len = ntohs (rp_msg->pkey_len);
-  msg_size_exp = sizeof (struct RecordCreateMessage) + key_len + name_len + rd_ser_len;
+  GNUNET_break (0 == ntohs (rp_msg->reserved));
+  msg_size_exp = sizeof (struct RecordCreateMessage) + name_len + rd_ser_len;
   if (msg_size != msg_size_exp)
   {
     GNUNET_break (0);
@@ -1243,8 +1244,7 @@ handle_record_create (void *cls,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  pkey_tmp = (const char *) &rp_msg[1];
-  name_tmp = &pkey_tmp[key_len];
+  name_tmp = (const char *) &rp_msg[1];
   rd_ser = &name_tmp[name_len];
   if ('\0' != name_tmp[name_len -1])
   {
@@ -1252,13 +1252,8 @@ handle_record_create (void *cls,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  if (NULL == (pkey = GNUNET_CRYPTO_ecc_decode_key (pkey_tmp, key_len,
-                                                    GNUNET_NO)))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
+  pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+  memcpy (pkey, &rp_msg->private_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey));
   {
     struct GNUNET_NAMESTORE_RecordData rd[rd_count];
 
@@ -1274,7 +1269,7 @@ handle_record_create (void *cls,
     /* Extracting and converting private key */
     GNUNET_CRYPTO_ecc_key_get_public (pkey, &pubkey);
     GNUNET_CRYPTO_short_hash (&pubkey,
-                              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                              sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                               &pubkey_hash);
     learn_private_key (pkey);    
     conv_name = GNUNET_NAMESTORE_normalize_string (name_tmp);
@@ -1373,7 +1368,7 @@ struct ZoneToNameCtx
  */
 static void
 handle_zone_to_name_it (void *cls,
-                        const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                        const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                         struct GNUNET_TIME_Absolute expire,
                         const char *name,
                         unsigned int rd_count,
@@ -1552,7 +1547,7 @@ struct ZoneIterationProcResult
  */
 static void
 zone_iteraterate_proc (void *cls,
-                       const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                       const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                        struct GNUNET_TIME_Absolute expire,
                        const char *name,
                        unsigned int rd_count,
@@ -1633,7 +1628,7 @@ zone_iteraterate_proc (void *cls,
     /* compute / obtain signature, but only if we (a) have records and (b) expiration times were 
        converted to absolute expiration times */
     GNUNET_CRYPTO_short_hash (zone_key, 
-                              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                              sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                               &zone_hash);
     GNUNET_CRYPTO_short_hash_double (&zone_hash, &long_hash);
     if (NULL != (cc = GNUNET_CONTAINER_multihashmap_get (zonekeys, &long_hash)))
@@ -1976,7 +1971,7 @@ monitor_next (void *cls,
  */
 static void
 monitor_iterate_cb (void *cls,
-                    const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                    const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                     struct GNUNET_TIME_Absolute expire,
                     const char *name,
                     unsigned int rd_count,
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index 7245e1631..58ecbf65d 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -166,7 +166,7 @@ struct LookupNameResponseMessage
   /**
    * The public key for the name
    */
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_EccPublicKey public_key;
 
   /* 0-terminated name and serialized record data */
   /* rd_len bytes serialized record data */
@@ -216,7 +216,7 @@ struct RecordPutMessage
   /**
    * The public key
    */
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_EccPublicKey public_key;
 
   /* name (0-terminated) followed by "rd_count" serialized records */
 
@@ -271,15 +271,16 @@ struct RecordCreateMessage
   uint16_t rd_count;
 
   /**
-   * private key length 
+   * always zero
    */
-  uint16_t pkey_len;
+  uint16_t reserved;
+
+  struct GNUNET_CRYPTO_EccPrivateKey private_key;
 
   /* followed by:
-   * GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded private key with length pkey_len
    * name with length name_len
    * serialized record data with length rd_len
-   * */
+   */
 };
 
 
@@ -366,7 +367,7 @@ struct ZoneToNameResponseMessage
   /**
    * Publik key
    */
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded zone_key;
+  struct GNUNET_CRYPTO_EccPublicKey zone_key;
 
 };
 
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 19ba86980..c5b213954 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -266,7 +266,7 @@ handle_lookup_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
   const char * rd_tmp;
   const struct GNUNET_CRYPTO_EccSignature *signature;
   struct GNUNET_TIME_Absolute expire;
-  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *public_key_tmp;
+  const struct GNUNET_CRYPTO_EccPublicKey *public_key_tmp;
   size_t exp_msg_len;
   size_t msg_len;
   size_t name_len;
@@ -518,7 +518,7 @@ handle_zone_iteration_response (struct GNUNET_NAMESTORE_ZoneIterator *ze,
                                 const struct LookupNameResponseMessage *msg,
                                 size_t size)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubdummy;
+  struct GNUNET_CRYPTO_EccPublicKey pubdummy;
   size_t msg_len;
   size_t exp_msg_len;
   size_t name_len;
@@ -931,7 +931,7 @@ GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h)
  */
 struct GNUNET_NAMESTORE_QueueEntry *
 GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
-                             const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                             const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                              const char *name,
                              struct GNUNET_TIME_Absolute freshness,
                              unsigned int rd_count,
@@ -1016,7 +1016,7 @@ GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
  * @return GNUNET_OK if the signature is valid
  */
 int
-GNUNET_NAMESTORE_verify_signature (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *public_key,
+GNUNET_NAMESTORE_verify_signature (const struct GNUNET_CRYPTO_EccPublicKey *public_key,
                                    const struct GNUNET_TIME_Absolute freshness,
                                    const char *name,
                                    unsigned int rd_count,
@@ -1087,16 +1087,13 @@ GNUNET_NAMESTORE_record_put_by_authority (struct GNUNET_NAMESTORE_Handle *h,
 {
   struct GNUNET_NAMESTORE_QueueEntry *qe;
   struct PendingMessage *pe;
-  char * name_tmp;
-  char * pkey_tmp;
-  char * rd_ser;
+  char *name_tmp;
+  char *rd_ser;
   size_t rd_ser_len;
   size_t msg_size;
   size_t name_len;
-  size_t key_len;
   uint32_t rid;
-  struct RecordCreateMessage * msg;
-  struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded * pkey_enc;
+  struct RecordCreateMessage *msg;
 
   GNUNET_assert (NULL != h);
   GNUNET_assert (NULL != pkey);
@@ -1115,13 +1112,9 @@ GNUNET_NAMESTORE_record_put_by_authority (struct GNUNET_NAMESTORE_Handle *h,
   qe->op_id = rid;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
 
-  pkey_enc = GNUNET_CRYPTO_ecc_encode_key (pkey);
-  GNUNET_assert (NULL != pkey_enc);
-
   /* setup msg */
-  key_len = ntohs (pkey_enc->size);
   rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
-  msg_size = sizeof (struct RecordCreateMessage) + key_len + name_len + rd_ser_len;
+  msg_size = sizeof (struct RecordCreateMessage) + name_len + rd_ser_len;
   pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
   pe->size = msg_size;
   pe->is_init = GNUNET_NO;
@@ -1132,15 +1125,14 @@ GNUNET_NAMESTORE_record_put_by_authority (struct GNUNET_NAMESTORE_Handle *h,
   msg->name_len = htons (name_len);
   msg->rd_count = htons (rd_count);
   msg->rd_len = htons (rd_ser_len);
-  msg->pkey_len = htons (key_len);
+  msg->reserved = htons (0);
   msg->expire = GNUNET_TIME_absolute_hton (GNUNET_TIME_UNIT_FOREVER_ABS);
-  pkey_tmp = (char *) &msg[1];
-  memcpy (pkey_tmp, pkey_enc, key_len);
-  name_tmp = &pkey_tmp[key_len];
+  msg->private_key = *pkey;
+
+  name_tmp = (char *) &msg[1];
   memcpy (name_tmp, name, name_len);
   rd_ser = &name_tmp[name_len];
   GNUNET_break (rd_ser_len == GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser));
-  GNUNET_free (pkey_enc);
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, 
        "Sending `%s' message for name `%s' with size %u\n", 
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 070549b33..64bfa631c 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -1,6 +1,6 @@
  /*
   * This file is part of GNUnet
-  * (C) 2009, 2011, 2012 Christian Grothoff (and other contributing authors)
+  * (C) 2009-2013 Christian Grothoff (and other contributing authors)
   *
   * GNUnet is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published
@@ -269,7 +269,7 @@ namestore_postgres_remove_records (void *cls,
  */
 static int 
 namestore_postgres_put_records (void *cls, 
-                                const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                                const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                                 struct GNUNET_TIME_Absolute expire,
                                 const char *name,
                                 unsigned int rd_count,
@@ -287,7 +287,7 @@ namestore_postgres_put_records (void *cls,
   unsigned int i;
 
   GNUNET_CRYPTO_short_hash (zone_key, 
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                             &zone);
   (void) namestore_postgres_remove_records (plugin, &zone, name);
   name_len = strlen (name);
@@ -327,7 +327,7 @@ namestore_postgres_put_records (void *cls,
       (const char *) &rvalue_be
     };
     int paramLengths[] = {
-      sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+      sizeof (struct GNUNET_CRYPTO_EccPublicKey),
       name_len,
       sizeof (uint32_t),
       data_size,
@@ -378,7 +378,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
 {
   unsigned int record_count;
   size_t data_size;
-  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key;
+  const struct GNUNET_CRYPTO_EccPublicKey *zone_key;
   const struct GNUNET_CRYPTO_EccSignature *sig;
   struct GNUNET_TIME_Absolute expiration;
   const char *data;
@@ -406,7 +406,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
   }
   GNUNET_assert (1 == cnt);
   if ((6 != PQnfields (res)) || 
-      (sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) != PQgetlength (res, 0, 0)) || 
+      (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != PQgetlength (res, 0, 0)) || 
       (sizeof (uint32_t) != PQfsize (res, 2)) || 
       (sizeof (uint64_t) != PQfsize (res, 4)) || 
       (sizeof (struct GNUNET_CRYPTO_EccSignature) != PQgetlength (res, 0, 5)))
@@ -415,7 +415,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
     PQclear (res);
     return GNUNET_SYSERR;
   }
-  zone_key = (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *) PQgetvalue (res, 0, 0);
+  zone_key = (const struct GNUNET_CRYPTO_EccPublicKey *) PQgetvalue (res, 0, 0);
   name = PQgetvalue (res, 0, 1);
   name_len = PQgetlength (res, 0, 1);
   record_count = ntohl (*(uint32_t *) PQgetvalue (res, 0, 2));
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 6c76d12e9..6ee3de495 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -1,6 +1,6 @@
  /*
   * This file is part of GNUnet
-  * (C) 2009, 2011, 2012 Christian Grothoff (and other contributing authors)
+  * (C) 2009-2013 Christian Grothoff (and other contributing authors)
   *
   * GNUnet is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published
@@ -450,7 +450,7 @@ namestore_sqlite_remove_records (void *cls,
  */
 static int 
 namestore_sqlite_put_records (void *cls, 
-                              const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                              const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                               struct GNUNET_TIME_Absolute expire,
                               const char *name,
                               unsigned int rd_count,
@@ -467,7 +467,7 @@ namestore_sqlite_put_records (void *cls,
   size_t data_size;
   unsigned int i;
 
-  GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &zone);
+  GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &zone);
   (void) namestore_sqlite_remove_records (plugin, &zone, name);
   name_len = strlen (name);
   GNUNET_CRYPTO_short_hash (name, name_len, &nh);
@@ -497,7 +497,7 @@ namestore_sqlite_put_records (void *cls,
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
-    if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 1, zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), SQLITE_STATIC)) ||
+    if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 1, zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey), SQLITE_STATIC)) ||
         (SQLITE_OK != sqlite3_bind_text (plugin->put_records, 2, name, -1, SQLITE_STATIC)) ||
         (SQLITE_OK != sqlite3_bind_int (plugin->put_records, 3, rd_count)) ||
         (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 4, data, data_size, SQLITE_STATIC)) ||
@@ -560,7 +560,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
   int sret;
   unsigned int record_count;
   size_t data_size;
-  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key;
+  const struct GNUNET_CRYPTO_EccPublicKey *zone_key;
   const struct GNUNET_CRYPTO_EccSignature *sig;
   struct GNUNET_TIME_Absolute expiration;
   const char *data;
@@ -578,7 +578,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
     expiration.abs_value = (uint64_t) sqlite3_column_int64 (stmt, 4);
     sig = sqlite3_column_blob (stmt, 5);
 
-    if ( (sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) != sqlite3_column_bytes (stmt, 0)) ||
+    if ( (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != sqlite3_column_bytes (stmt, 0)) ||
          (sizeof (struct GNUNET_CRYPTO_EccSignature) != sqlite3_column_bytes (stmt, 5)) )
     {
       GNUNET_break (0);
diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c
index 32dd4844c..3397b35f1 100644
--- a/src/namestore/test_namestore_api.c
+++ b/src/namestore/test_namestore_api.c
@@ -41,7 +41,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_ShortHashCode zone;
 
@@ -96,7 +96,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 name_lookup_proc (void *cls,
-                  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                  const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                   struct GNUNET_TIME_Absolute expire,
                   const char *name,
                   unsigned int rd_count,
diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c
index aba18c192..4eac96df6 100644
--- a/src/namestore/test_namestore_api_create.c
+++ b/src/namestore/test_namestore_api_create.c
@@ -52,7 +52,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_ShortHashCode s_zone;
 
@@ -108,7 +108,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void 
 name_lookup_second_proc (void *cls,
-                         const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                         const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                          struct GNUNET_TIME_Absolute expire,
                          const char *n,
                          unsigned int rd_count,
@@ -122,7 +122,7 @@ name_lookup_second_proc (void *cls,
   if (n != NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Checking returned results\n");
-    if (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
+    if (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey)))
     {
       GNUNET_break (0);
       failed = GNUNET_YES;
@@ -203,7 +203,7 @@ create_second_cont (void *cls, int32_t success, const char *emsg)
 
 static void 
 name_lookup_initial_proc (void *cls,
-                          const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                          const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                           struct GNUNET_TIME_Absolute expire,
                           const char *n,
                           unsigned int rd_count,
@@ -219,7 +219,7 @@ name_lookup_initial_proc (void *cls,
   if (n != NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Checking returned results\n");
-    if (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
+    if (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey)))
     {
       GNUNET_break (0);
       failed = GNUNET_YES;
@@ -353,7 +353,7 @@ run (void *cls,
   GNUNET_NAMESTORE_records_serialize(1, s_first_record, rd_ser_len, rd_ser);
 
   /* create random zone hash */
-  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &s_zone);
+  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name: `%s' Zone: `%s' \n", s_name, GNUNET_NAMESTORE_short_h2s (&s_zone));
   nsh = GNUNET_NAMESTORE_connect (cfg);
diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c
index 28211d439..f1e66963f 100644
--- a/src/namestore/test_namestore_api_create_update.c
+++ b/src/namestore/test_namestore_api_create_update.c
@@ -52,7 +52,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_EccSignature *s_signature;
 
@@ -243,7 +243,7 @@ run (void *cls,
   s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_first_record, 1);
 
   /* create random zone hash */
-  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &s_zone);
+  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name: `%s' Zone: `%s' \n", s_name, GNUNET_NAMESTORE_short_h2s (&s_zone));
   nsh = GNUNET_NAMESTORE_connect (cfg);
diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c
index 7673e0fa7..d8f6fe056 100644
--- a/src/namestore/test_namestore_api_lookup.c
+++ b/src/namestore/test_namestore_api_lookup.c
@@ -45,7 +45,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_EccSignature *s_signature;
 
@@ -105,7 +105,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 name_lookup_proc (void *cls,
-                  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                  const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                   struct GNUNET_TIME_Absolute expire,
                   const char *n,
                   unsigned int rd_count,
@@ -119,7 +119,7 @@ name_lookup_proc (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Checking returned results\n");
     if (0 != memcmp (zone_key, &pubkey, 
-                     sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
+                     sizeof (struct GNUNET_CRYPTO_EccPublicKey)))
     {
       GNUNET_break (0);
     }
@@ -243,7 +243,7 @@ run (void *cls,
     
     /* create random zone hash */
     GNUNET_CRYPTO_short_hash (&pubkey, 
-                              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), 
+                              sizeof (struct GNUNET_CRYPTO_EccPublicKey), 
                               &s_zone);
     nsh = GNUNET_NAMESTORE_connect (cfg);
     GNUNET_break (NULL != nsh);
diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c
index 49988ed3f..28632c83f 100644
--- a/src/namestore/test_namestore_api_lookup_specific_type.c
+++ b/src/namestore/test_namestore_api_lookup_specific_type.c
@@ -50,7 +50,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_EccSignature *s_signature;
 
@@ -110,7 +110,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void 
 name_lookup_existing_record_type (void *cls,
-                                  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                                  const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                                   struct GNUNET_TIME_Absolute expire,
                                   const char *n,
                                   unsigned int rd_count,
@@ -121,7 +121,7 @@ name_lookup_existing_record_type (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore returned %u records\n", rd_count);
 
-  if ((NULL == n) || (0 != memcmp(zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded))))
+  if ((NULL == n) || (0 != memcmp(zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey))))
   {
     GNUNET_break(0);
     failed = GNUNET_YES;
@@ -156,7 +156,7 @@ name_lookup_existing_record_type (void *cls,
 
 static void
 name_lookup_non_existing_record_type (void *cls,
-                                      const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                                      const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                                       struct GNUNET_TIME_Absolute expire,
                                       const char *n,
                                       unsigned int rd_count,
@@ -300,7 +300,7 @@ run (void *cls,
     s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd, RECORDS);
 
     /* create random zone hash */
-    GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &s_zone);
+    GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
     nsh = GNUNET_NAMESTORE_connect (cfg);
     GNUNET_break (NULL != nsh);
     GNUNET_break (s_rd != NULL);
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index b3147c43a..c103952fa 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -39,13 +39,13 @@ static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_HashCode zone;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey2;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey2;
 
 static struct GNUNET_HashCode zone2;
 
@@ -152,7 +152,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-           const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+           const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
            struct GNUNET_TIME_Absolute expire,
            const char *name,
            unsigned int rd_count,
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c
index df5cb336e..ff99b60f9 100644
--- a/src/namestore/test_namestore_api_put.c
+++ b/src/namestore/test_namestore_api_put.c
@@ -44,7 +44,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_NAMESTORE_RecordData *s_rd;
 
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 77edd3fa9..f278b30db 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -51,7 +51,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_EccSignature *s_signature;
 
@@ -109,7 +109,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 name_lookup_proc (void *cls,
-                  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                  const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                   struct GNUNET_TIME_Absolute expire,
                   const char *n,
                   unsigned int rd_count,
@@ -124,7 +124,7 @@ name_lookup_proc (void *cls,
                 "Lookup for name `%s' returned %u records\n", n, rd_count);
     if (0 != memcmp (zone_key, 
                      &pubkey,
-                     sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
+                     sizeof (struct GNUNET_CRYPTO_EccPublicKey)))
     {
       GNUNET_break (0);
       failed = GNUNET_YES;
@@ -254,7 +254,7 @@ run (void *cls,
   s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd, RECORDS);
 
   /* create random zone hash */
-  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &s_zone);
+  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name: `%s' Zone: `%s' \n", s_name, GNUNET_NAMESTORE_short_h2s (&s_zone));
   nsh = GNUNET_NAMESTORE_connect (cfg);
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c
index 4e207257e..a85bc8c05 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -51,7 +51,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_EccSignature *s_signature;
 
@@ -202,7 +202,7 @@ run (void *cls,
   s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd, RECORDS);
 
   /* create random zone hash */
-  GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &s_zone);
+  GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name: `%s' Zone: `%s' \n", s_name, GNUNET_h2s_full(&s_zone));
   nsh = GNUNET_NAMESTORE_connect (cfg);
diff --git a/src/namestore/test_namestore_api_sign_verify.c b/src/namestore/test_namestore_api_sign_verify.c
index 647cc59be..e2913991c 100644
--- a/src/namestore/test_namestore_api_sign_verify.c
+++ b/src/namestore/test_namestore_api_sign_verify.c
@@ -44,7 +44,7 @@
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_NAMESTORE_RecordData *s_rd;
 
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index f2d77d2ac..63e4adf40 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -39,13 +39,13 @@ static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_HashCode zone;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey2;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey2;
 
 static struct GNUNET_HashCode zone2;
 
@@ -179,7 +179,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-           const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+           const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
            struct GNUNET_TIME_Absolute expire,
            const char *name,
            unsigned int rd_count,
@@ -204,7 +204,7 @@ zone_proc (void *cls,
     if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (zone_key, expire, name, rd_count, rd, signature))
     {
       struct GNUNET_HashCode zone_key_hash;
-      GNUNET_CRYPTO_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &zone_key_hash);
+      GNUNET_CRYPTO_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &zone_key_hash);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Verifying signature for `%s' in zone `%s' with %u records  and expiration %llu failed\n", name, GNUNET_h2s(&zone_key_hash), rd_count, expire.abs_value);
 
       failed = GNUNET_YES;
@@ -354,7 +354,7 @@ create_record (unsigned int count)
  */
 static void
 empty_zone_proc (void *cls,
-                 const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                 const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                  struct GNUNET_TIME_Absolute expire,
                  const char *name,
                  unsigned int rd_count,
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 3dce51d90..020c8358f 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -39,13 +39,13 @@ static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_CRYPTO_ShortHashCode zone;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey2;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey2;
 
 static struct GNUNET_CRYPTO_ShortHashCode zone2;
 
@@ -174,7 +174,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-           const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+           const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
            struct GNUNET_TIME_Absolute expire,
            const char *name,
            unsigned int rd_count,
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index 9c1829e91..5d44555d1 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -38,13 +38,13 @@ static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_HashCode zone;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey2;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey2;
 
 static struct GNUNET_HashCode zone2;
 
@@ -177,7 +177,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-           const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+           const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
            struct GNUNET_TIME_Absolute expire,
            const char *name,
            unsigned int rd_count,
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index f0b712eb9..e1fefec09 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -45,7 +45,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
 static struct GNUNET_TIME_Absolute expire;
 
@@ -98,7 +98,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_to_name_proc (void *cls,
-                   const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+                   const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
                    struct GNUNET_TIME_Absolute expire,
                    const char *n,
                    unsigned int rd_count,
@@ -125,7 +125,7 @@ zone_to_name_proc (void *cls,
       fail = GNUNET_YES;
       GNUNET_break (0);
     }
-    if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded))))
+    if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey))))
     {
       fail = GNUNET_YES;
       GNUNET_break (0);
@@ -182,7 +182,7 @@ run (void *cls,
   GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
 
   /* zone hash */
-  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &s_zone);
+  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
   GNUNET_CRYPTO_short_hash (s_name, strlen (s_name) + 1, &s_zone_value);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_NAMESTORE_short_h2s (&s_zone_value));
 
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index b7d2341e4..35c9e920f 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -95,7 +95,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
  */
 static void 
 test_record (void *cls,
-             const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
+             const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
              struct GNUNET_TIME_Absolute expire,
              const char *name,
              unsigned int rd_count,
@@ -104,7 +104,7 @@ test_record (void *cls,
 {
   int *idp = cls;
   int id = *idp;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded tzone_key;
+  struct GNUNET_CRYPTO_EccPublicKey tzone_key;
   char tname[64];
   unsigned int trd_count = 1 + (id % 1024);
   struct GNUNET_CRYPTO_EccSignature tsignature;
@@ -122,7 +122,7 @@ test_record (void *cls,
   memset (&tzone_key, (id % 241), sizeof (tzone_key));
   memset (&tsignature, (id % 243), sizeof (tsignature));
   GNUNET_assert (0 == strcmp (name, tname));
-  GNUNET_assert (0 == memcmp (&tzone_key, zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)));
+  GNUNET_assert (0 == memcmp (&tzone_key, zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey)));
   GNUNET_assert (0 == memcmp (&tsignature, signature, sizeof (struct GNUNET_CRYPTO_EccSignature)));
 }
 
@@ -139,7 +139,7 @@ get_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
 static void
 put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded zone_key;
+  struct GNUNET_CRYPTO_EccPublicKey zone_key;
   struct GNUNET_TIME_Absolute expire;
   char name[64];
   unsigned int rd_count = 1 + (id % 1024);
@@ -175,7 +175,7 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_NAMESTORE_PluginFunctions *nsp;  
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded zone_key;
+  struct GNUNET_CRYPTO_EccPublicKey zone_key;
   struct GNUNET_CRYPTO_ShortHashCode zone;
   
   ok = 0;