23 files changed, 145 insertions, 180 deletions

diff --git a/src/gns/gns.h b/src/gns/gns.h
index e5d48fa27..a4830bda4 100644
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -71,9 +71,9 @@ struct GNUNET_GNS_ClientLookupMessage
   uint32_t only_cached GNUNET_PACKED;
 
   /**
-   * Should we look up in the default zone?
+   * Should we look up in the given zone, instead of the default zone?
    */
-  uint32_t use_default_zone GNUNET_PACKED;
+  uint32_t have_zone GNUNET_PACKED;
 
   /**
    * Is a shorten key attached?
@@ -84,8 +84,11 @@ struct GNUNET_GNS_ClientLookupMessage
    * the type of record to look up
    */
   /* enum GNUNET_GNS_RecordType */ uint32_t type;
-
-  /* Followed by the key for shorten (optional) see have_key */
+  
+  /**
+   * The key for shorten, if 'have_key' is set 
+   */
+  struct GNUNET_CRYPTO_EccPrivateKey shorten_key;
 
   /* Followed by the name to look up */
 };
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index fe378a922..e672c5687 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -832,35 +832,20 @@ GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
   struct GNUNET_GNS_LookupRequest *lr;
   size_t msize;
   struct PendingMessage *pending;
-  struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *pkey_enc;
-  size_t key_len;
-  char* pkey_tmp;
 
   if (NULL == name)
   {
     GNUNET_break (0);
     return NULL;
   } 
-  if (NULL != shorten_key)
-  {
-    pkey_enc = GNUNET_CRYPTO_ecc_encode_key (shorten_key);
-    GNUNET_assert (pkey_enc != NULL);
-    key_len = ntohs (pkey_enc->size);
-  }
-  else
-  {
-    pkey_enc = NULL;
-    key_len = 0;
-  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Trying to lookup `%s' in GNS\n", 
               name);
   msize = sizeof (struct GNUNET_GNS_ClientLookupMessage)
-    + key_len + strlen (name) + 1;
+    + strlen (name) + 1;
   if (msize > UINT16_MAX)
   {
     GNUNET_break (0);
-    GNUNET_free (pkey_enc);
     return NULL;
   }
   lr = GNUNET_malloc (sizeof (struct GNUNET_GNS_LookupRequest) +
@@ -882,26 +867,16 @@ GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
   lookup_msg->only_cached = htonl (only_cached);
   if (NULL != zone)
   {
-    lookup_msg->use_default_zone = htonl (GNUNET_NO);
-    memcpy (&lookup_msg->zone, zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+    lookup_msg->have_zone = htonl (GNUNET_YES);
+    lookup_msg->zone = *zone;
   }
-  else
-  {
-    lookup_msg->use_default_zone = htonl (GNUNET_YES);
-    memset (&lookup_msg->zone, 0, sizeof(struct GNUNET_CRYPTO_ShortHashCode));
-  }  
   lookup_msg->type = htonl (type);
-  pkey_tmp = (char *) &lookup_msg[1];  
-  if (pkey_enc != NULL)
+  if (NULL != shorten_key)
   {
     lookup_msg->have_key = htonl (GNUNET_YES);
-    memcpy (pkey_tmp, pkey_enc, key_len);
+    lookup_msg->shorten_key = *shorten_key;
   }
-  else
-    lookup_msg->have_key = htonl (GNUNET_NO);
-  GNUNET_free_non_null (pkey_enc);
-  memcpy (&pkey_tmp[key_len], name, strlen (name) + 1);
-
+  memcpy (&lookup_msg[1], name, strlen (name) + 1);
   GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head,
                                     handle->pending_tail,
                                     pending);
diff --git a/src/gns/gnunet-gns-fcfsd.c b/src/gns/gnunet-gns-fcfsd.c
index 25fde90ec..832060583 100644
--- a/src/gns/gnunet-gns-fcfsd.c
+++ b/src/gns/gnunet-gns-fcfsd.c
@@ -229,7 +229,7 @@ run_httpd_now ()
 
 static void
 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_len,
@@ -506,7 +506,7 @@ put_continuation (void *cls,
  */
 static void 
 zone_to_name_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,
@@ -566,7 +566,7 @@ zone_to_name_cb (void *cls,
  */
 static void 
 lookup_result_processor (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,
@@ -883,7 +883,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   char *keyfile;
   unsigned long long port;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
+  struct GNUNET_CRYPTO_EccPublicKey pub;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg,
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c
index a15b3547c..f0bf6577c 100644
--- a/src/gns/gnunet-gns-helper-service-w32.c
+++ b/src/gns/gnunet-gns-helper-service-w32.c
@@ -663,7 +663,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 
   char* keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key = NULL;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
@@ -680,7 +680,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
       key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
       GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
       GNUNET_CRYPTO_short_hash(&pkey,
-                         sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                         sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                          &user_zone);
       zone = &user_zone;
       GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 59e4f89fe..4752422dd 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -3189,7 +3189,7 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   char *keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   struct GNUNET_CRYPTO_ShortHashCode *zone;
   struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
 
@@ -3212,9 +3212,9 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
   key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
   GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
   local_gns_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
-  GNUNET_CRYPTO_short_hash(&pkey,
-                           sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
-                           local_gns_zone);
+  GNUNET_CRYPTO_short_hash (&pkey,
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                            local_gns_zone);
   zone = local_gns_zone;
   GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3241,9 +3241,9 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
     key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
     GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
     local_private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
-    GNUNET_CRYPTO_short_hash(&pkey,
-                             sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
-                             local_private_zone);
+    GNUNET_CRYPTO_short_hash (&pkey,
+                              sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                              local_private_zone);
     GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Using private zone: %s!\n", &zonename);
@@ -3270,9 +3270,9 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
     key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
     GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
     local_shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
-    GNUNET_CRYPTO_short_hash(&pkey,
-                             sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
-                             local_shorten_zone);
+    GNUNET_CRYPTO_short_hash (&pkey,
+                              sizeof(struct GNUNET_CRYPTO_EccPublicKey),
+                              local_shorten_zone);
     GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Using shorten zone: %s!\n", &zonename);
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 542a8106d..fa0a99590 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -205,7 +205,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   char* keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key = NULL;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   struct GNUNET_CRYPTO_ShortHashCode *zone = NULL;
   struct GNUNET_CRYPTO_ShortHashCode user_zone;
   struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
@@ -233,7 +233,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
     GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
     GNUNET_CRYPTO_short_hash (&pkey,
-                              sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                              sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                               &user_zone);
     zone = &user_zone;
     GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
@@ -257,7 +257,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_CRYPTO_ecc_key_get_public (shorten_key, &pkey);
     shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
     GNUNET_CRYPTO_short_hash(&pkey,
-                             sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                             sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                              shorten_zone);
     GNUNET_CRYPTO_short_hash_to_enc (shorten_zone, &zonename);
     if (! raw)
@@ -277,10 +277,10 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     private_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
     GNUNET_CRYPTO_ecc_key_get_public (private_key, &pkey);
-    private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
-    GNUNET_CRYPTO_short_hash(&pkey,
-                             sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
-                             private_zone);
+    private_zone = GNUNET_new (struct GNUNET_CRYPTO_ShortHashCode);
+    GNUNET_CRYPTO_short_hash (&pkey,
+                              sizeof(struct GNUNET_CRYPTO_EccPublicKey),
+                              private_zone);
     GNUNET_CRYPTO_short_hash_to_enc (private_zone, &zonename);
     if (! raw)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index fcfa4b138..8200e3f87 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -382,7 +382,7 @@ publish_zone_dht_start (void *cls,
  */
 static void
 put_gns_record (void *cls,
-                const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                const struct GNUNET_CRYPTO_EccPublicKey *key,
                 struct GNUNET_TIME_Absolute expiration,
                 const char *name,
                 unsigned int rd_count,
@@ -486,7 +486,7 @@ put_gns_record (void *cls,
   nrb_data += namelen;
   rd_payload_length += sizeof(struct GNSNameRecordBlock) + namelen;
   GNUNET_CRYPTO_short_hash (key,
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                             &zhash);
   if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
                                                 rd,
@@ -637,7 +637,7 @@ send_shorten_response (void* cls, const char* name)
  */
 static void
 process_shorten_in_private_zone_lookup (void *cls,
-                                        const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                                        const struct GNUNET_CRYPTO_EccPublicKey *key,
                                         struct GNUNET_TIME_Absolute expiration,
                                         const char *name,
                                         unsigned int rd_count,
@@ -693,7 +693,7 @@ process_shorten_in_private_zone_lookup (void *cls,
  */
 static void
 process_shorten_in_root_zone_lookup (void *cls,
-                                     const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                                     const struct GNUNET_CRYPTO_EccPublicKey *key,
                                      struct GNUNET_TIME_Absolute expiration,
                                      const char *name,
                                      unsigned int rd_count,
@@ -749,7 +749,7 @@ process_shorten_in_root_zone_lookup (void *cls,
  */
 static void
 process_private_in_root_zone_lookup (void *cls,
-                                     const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                                     const struct GNUNET_CRYPTO_EccPublicKey *key,
                                      struct GNUNET_TIME_Absolute expiration,
                                      const char *name,
                                      unsigned int rd_count,
@@ -1075,9 +1075,7 @@ handle_lookup (void *cls,
   char* nameptr = name;
   const char *utf_in;
   int only_cached;
-  struct GNUNET_CRYPTO_EccPrivateKey *key;
-  struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *pkey;
-  char* tmp_pkey;
+  const struct GNUNET_CRYPTO_EccPrivateKey *key;
   uint16_t msg_size;
   const struct GNUNET_GNS_ClientLookupMessage *sh_msg;
   
@@ -1094,24 +1092,20 @@ handle_lookup (void *cls,
   GNUNET_SERVER_notification_context_add (nc, client);
   if (GNUNET_YES == ntohl (sh_msg->have_key))
   {
-    pkey = (struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *) &sh_msg[1];
-    tmp_pkey = (char*) &sh_msg[1];
-    key = GNUNET_CRYPTO_ecc_decode_key (tmp_pkey, ntohs (pkey->size),
-                                        GNUNET_NO);
-    GNUNET_STRINGS_utf8_tolower (&tmp_pkey[ntohs (pkey->size)], &nameptr);
+    key = &sh_msg->shorten_key;
   }
   else
   {
     key = NULL;
-    utf_in = (const char *) &sh_msg[1];
-    if ('\0' != utf_in[msg_size - sizeof (struct GNUNET_GNS_ClientLookupMessage) - 1])
-    {
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }  
-    GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
   }
+  utf_in = (const char *) &sh_msg[1];
+  if ('\0' != utf_in[msg_size - sizeof (struct GNUNET_GNS_ClientLookupMessage) - 1])
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
+  }  
+  GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
   
   namelen = strlen (name) + 1;
   clh = GNUNET_malloc (sizeof (struct ClientLookupHandle));
@@ -1121,8 +1115,11 @@ handle_lookup (void *cls,
   strcpy (clh->name, name);
   clh->request_id = sh_msg->id;
   clh->type = ntohl (sh_msg->type);
-  clh->shorten_key = key;
-
+  if (NULL != key)
+  {
+    clh->shorten_key = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+    *clh->shorten_key = *key;
+  }
   only_cached = ntohl (sh_msg->only_cached);
   
   if (strlen (name) > GNUNET_DNSPARSER_MAX_NAME_LENGTH) {
@@ -1153,7 +1150,7 @@ handle_lookup (void *cls,
     return;
   }
   
-  if (1 == ntohl (sh_msg->use_default_zone))
+  if (GNUNET_NO == ntohl (sh_msg->have_zone))
     clh->zone = zone_hash;  /* Default zone */
   else
     clh->zone = sh_msg->zone;
@@ -1196,7 +1193,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     {&handle_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
   };
   char* keyfile;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   unsigned long long max_parallel_bg_queries = 0;
   int ignore_pending = GNUNET_NO;
 
@@ -1217,9 +1214,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 
   zone_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
   GNUNET_CRYPTO_ecc_key_get_public (zone_key, &pkey);
-  GNUNET_CRYPTO_short_hash(&pkey,
-                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
-                     &zone_hash);
+  GNUNET_CRYPTO_short_hash (&pkey,
+                            sizeof(struct GNUNET_CRYPTO_EccPublicKey),
+                            &zone_hash);
   GNUNET_free(keyfile);
   namestore_handle = GNUNET_NAMESTORE_connect (c);
   if (NULL == namestore_handle)
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 2cde3e37e..2e96b60ea 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -270,7 +270,7 @@ create_pkey_cont (void* cls, int32_t success, const char* emsg)
  */
 static void
 process_pseu_lookup_ns (void* cls,
-                        const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                        const struct GNUNET_CRYPTO_EccPublicKey *key,
                         struct GNUNET_TIME_Absolute expiration,
                         const char *name, unsigned int rd_count,
                         const struct GNUNET_NAMESTORE_RecordData *rd,
@@ -464,12 +464,12 @@ process_auth_discovery_dht_result (void* cls,
  */
 static void
 process_auth_discovery_ns_result (void* cls,
-                      const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
-                      struct GNUNET_TIME_Absolute expiration,
-                      const char *name,
-                      unsigned int rd_count,
-                      const struct GNUNET_NAMESTORE_RecordData *rd,
-                      const struct GNUNET_CRYPTO_EccSignature *signature)
+                                  const struct GNUNET_CRYPTO_EccPublicKey *key,
+                                  struct GNUNET_TIME_Absolute expiration,
+                                  const char *name,
+                                  unsigned int rd_count,
+                                  const struct GNUNET_NAMESTORE_RecordData *rd,
+                                  const struct GNUNET_CRYPTO_EccSignature *signature)
 {
   struct GetPseuAuthorityHandle* gph = cls;
   struct GNUNET_HashCode lookup_key;
@@ -537,7 +537,7 @@ process_auth_discovery_ns_result (void* cls,
  */
 static void
 process_zone_to_name_discover (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,
@@ -575,12 +575,11 @@ shorten_authority_chain (struct GetPseuAuthorityHandle *gph)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "GNS_AUTO_PSEU: New authority %s discovered\n",
               gph->auth->name);
-
   gph->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
-                                 &gph->our_zone,
-                                 &gph->auth->zone,
-                                 &process_zone_to_name_discover,
-                                 gph);
+                                                       &gph->our_zone,
+                                                       &gph->auth->zone,
+                                                       &process_zone_to_name_discover,
+                                                       gph);
 }
 
 
@@ -596,21 +595,12 @@ start_shorten (struct AuthorityChain *auth,
                const struct GNUNET_CRYPTO_EccPrivateKey *key)
 {
   struct GetPseuAuthorityHandle *gph;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
-  struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *pb_key;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   
   GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
-  if (NULL == (pb_key = GNUNET_CRYPTO_ecc_encode_key (key)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to encode ECC key on shorten\n");
-    return;
-  }
   gph = GNUNET_new (struct GetPseuAuthorityHandle);
-  gph->key = GNUNET_CRYPTO_ecc_decode_key ((const char*) pb_key, 
-                                           ntohs (pb_key->size),
-                                           GNUNET_YES);
-  GNUNET_free (pb_key);
+  gph->key = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+  *gph->key = *key;
   if (NULL == gph->key)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -619,7 +609,7 @@ start_shorten (struct AuthorityChain *auth,
     return;
   }
   GNUNET_CRYPTO_short_hash (&pkey,
-                        sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                        sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                         &gph->our_zone);
   gph->auth = GNUNET_malloc (sizeof (struct AuthorityChain));
   memcpy (gph->auth, auth, sizeof (struct AuthorityChain));
@@ -1157,7 +1147,7 @@ resolve_record_dht (struct ResolverHandle *rh)
  */
 static void
 process_record_result_ns (void* cls,
-                          const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                          const struct GNUNET_CRYPTO_EccPublicKey *key,
                           struct GNUNET_TIME_Absolute expiration,
                           const char *name, unsigned int rd_count,
                           const struct GNUNET_NAMESTORE_RecordData *rd,
@@ -1172,7 +1162,7 @@ process_record_result_ns (void* cls,
 
   rh->namestore_task = NULL;
   GNUNET_CRYPTO_short_hash (key,
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                             &zone);
   remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
   rh->status = 0;
@@ -2040,7 +2030,7 @@ handle_delegation_ns (void* cls, struct ResolverHandle *rh,
  */
 static void
 process_pkey_revocation_result_ns (void *cls,
-                                   const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                                   const struct GNUNET_CRYPTO_EccPublicKey *key,
                                    struct GNUNET_TIME_Absolute expiration,
                                    const char *name,
                                    unsigned int rd_count,
@@ -3069,7 +3059,7 @@ handle_delegation_ns (void* cls, struct ResolverHandle *rh,
  */
 static void
 process_delegation_result_ns (void* cls,
-                              const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+                              const struct GNUNET_CRYPTO_EccPublicKey *key,
                               struct GNUNET_TIME_Absolute expiration,
                               const char *name,
                               unsigned int rd_count,
@@ -3086,7 +3076,7 @@ process_delegation_result_ns (void* cls,
  
   rh->namestore_task = NULL;
   GNUNET_CRYPTO_short_hash (key,
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                             &zone);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "GNS_PHASE_DELEGATE_NS-%llu: Got %d records from authority lookup for `%s' in zone %s\n",
@@ -3515,7 +3505,7 @@ finish_shorten (struct ResolverHandle *rh,
  */
 static void
 process_zone_to_name_shorten_root (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,
@@ -3537,12 +3527,12 @@ process_zone_to_name_shorten_root (void *cls,
  */
 static void
 process_zone_to_name_shorten_shorten (void *cls,
-                 const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
-                 struct GNUNET_TIME_Absolute expire,
-                 const char *name,
-                 unsigned int rd_len,
-                 const struct GNUNET_NAMESTORE_RecordData *rd,
-                 const struct GNUNET_CRYPTO_EccSignature *signature)
+                                      const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+                                      struct GNUNET_TIME_Absolute expire,
+                                      const char *name,
+                                      unsigned int rd_len,
+                                      const struct GNUNET_NAMESTORE_RecordData *rd,
+                                      const struct GNUNET_CRYPTO_EccSignature *signature)
 {
   struct ResolverHandle *rh = cls;
   struct NameShortenHandle* nsh = rh->proc_cls;
@@ -3653,12 +3643,12 @@ process_zone_to_name_shorten_shorten (void *cls,
  */
 static void
 process_zone_to_name_shorten_private (void *cls,
-                 const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
-                 struct GNUNET_TIME_Absolute expire,
-                 const char *name,
-                 unsigned int rd_len,
-                 const struct GNUNET_NAMESTORE_RecordData *rd,
-                 const struct GNUNET_CRYPTO_EccSignature *signature)
+                                      const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+                                      struct GNUNET_TIME_Absolute expire,
+                                      const char *name,
+                                      unsigned int rd_len,
+                                      const struct GNUNET_NAMESTORE_RecordData *rd,
+                                      const struct GNUNET_CRYPTO_EccSignature *signature)
 {
   struct ResolverHandle *rh = cls;
   struct NameShortenHandle* nsh = rh->proc_cls;
@@ -3768,12 +3758,12 @@ process_zone_to_name_shorten_private (void *cls,
  */
 static void
 process_zone_to_name_shorten_root (void *cls,
-                 const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
-                 struct GNUNET_TIME_Absolute expire,
-                 const char *name,
-                 unsigned int rd_len,
-                 const struct GNUNET_NAMESTORE_RecordData *rd,
-                 const struct GNUNET_CRYPTO_EccSignature *signature)
+                                   const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+                                   struct GNUNET_TIME_Absolute expire,
+                                   const char *name,
+                                   unsigned int rd_len,
+                                   const struct GNUNET_NAMESTORE_RecordData *rd,
+                                   const struct GNUNET_CRYPTO_EccSignature *signature)
 {
   struct ResolverHandle *rh = cls;
   struct NameShortenHandle* nsh = rh->proc_cls;
@@ -3990,13 +3980,13 @@ handle_delegation_ns_shorten (void* cls,
  * @param signature the signature for the record data
  */
 static void
-process_zone_to_name_zkey(void *cls,
-                 const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
-                 struct GNUNET_TIME_Absolute expire,
-                 const char *name,
-                 unsigned int rd_len,
-                 const struct GNUNET_NAMESTORE_RecordData *rd,
-                 const struct GNUNET_CRYPTO_EccSignature *signature)
+process_zone_to_name_zkey (void *cls,
+                           const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+                           struct GNUNET_TIME_Absolute expire,
+                           const char *name,
+                           unsigned int rd_len,
+                           const struct GNUNET_NAMESTORE_RecordData *rd,
+                           const struct GNUNET_CRYPTO_EccSignature *signature)
 {
   struct ResolverHandle *rh = cls;
   struct NameShortenHandle *nsh = rh->proc_cls;
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 72149ef4f..ffc38c99b 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -237,7 +237,7 @@ block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
     return GNUNET_SYSERR; 
   }
   GNUNET_CRYPTO_short_hash (&nrb->public_key,
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                             &pkey_hash);
   GNUNET_GNS_get_key_for_record (name, &pkey_hash, key);
   return GNUNET_OK;
diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c
index cc1df9407..325583001 100644
--- a/src/gns/test_gns_cname_lookup.c
+++ b/src/gns/test_gns_cname_lookup.c
@@ -334,7 +334,7 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c
index e743e0fd3..fbaacfdfa 100644
--- a/src/gns/test_gns_dht_delegated_lookup.c
+++ b/src/gns/test_gns_dht_delegated_lookup.c
@@ -65,8 +65,8 @@ static struct GNUNET_DHT_Handle *dht_handle;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
 static struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
 static struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
 
@@ -262,7 +262,7 @@ put_dht(void *cls, int32_t success, const char *emsg)
   }
   GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
   GNUNET_CRYPTO_short_hash(&bob_pkey,
-                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                     sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                      &zone_hash);
   GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 58edb9cc5..35a738aef 100644
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -309,7 +309,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   struct in_addr *web;
   struct GNUNET_NAMESTORE_RecordData rd;
 
@@ -380,7 +380,7 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKey pkey;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n");
diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c
index 82273798f..cc993e347 100644
--- a/src/gns/test_gns_max_queries.c
+++ b/src/gns/test_gns_max_queries.c
@@ -252,8 +252,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c
index e62d34e9a..0673243b6 100644
--- a/src/gns/test_gns_ns_lookup.c
+++ b/src/gns/test_gns_ns_lookup.c
@@ -561,7 +561,7 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
   char* alice_keyfile;
   struct GNUNET_NAMESTORE_RecordData rd[2];
   struct in_addr ns;
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index 28f92f8b5..7413c7074 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -69,11 +69,11 @@ static struct GNUNET_DHT_Handle *dht_handle;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded our_pkey;
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded priv_pkey;
-static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded short_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey our_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey priv_pkey;
+static struct GNUNET_CRYPTO_EccPublicKey short_pkey;
 static struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
 static struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
 static struct GNUNET_CRYPTO_EccPrivateKey *our_key;
@@ -316,7 +316,7 @@ put_pseu_dht (void *cls, int success)
   }
   GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash);
   GNUNET_CRYPTO_short_hash(&alice_pkey,
-                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                     sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                      &zone_hash);
 
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
@@ -405,7 +405,7 @@ put_www_dht (void *cls, int success)
   }
   GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
   GNUNET_CRYPTO_short_hash(&alice_pkey,
-                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                     sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                      &zone_hash);
   GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
@@ -488,7 +488,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg)
   GNUNET_CRYPTO_short_hash (TEST_AUTHORITY_ALICE,
                             strlen (TEST_AUTHORITY_ALICE), &name_hash);
   GNUNET_CRYPTO_short_hash (&bob_pkey,
-                            sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+                            sizeof(struct GNUNET_CRYPTO_EccPublicKey),
                             &zone_hash);
   GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c
index c491db4aa..e66655203 100644
--- a/src/gns/test_gns_revocation.c
+++ b/src/gns/test_gns_revocation.c
@@ -180,8 +180,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c
index 4804de6f8..ff19569d6 100644
--- a/src/gns/test_gns_simple_delegated_lookup.c
+++ b/src/gns/test_gns_simple_delegated_lookup.c
@@ -189,8 +189,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c
index 7a25e7ca1..7a3e8af93 100644
--- a/src/gns/test_gns_simple_get_authority.c
+++ b/src/gns/test_gns_simple_get_authority.c
@@ -178,9 +178,9 @@ void do_check (void *cls,
               const struct GNUNET_CONFIGURATION_Handle *ccfg,
               struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded our_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey our_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *our_key;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
diff --git a/src/gns/test_gns_simple_lookup.c b/src/gns/test_gns_simple_lookup.c
index a7c3348fd..fceb8f052 100644
--- a/src/gns/test_gns_simple_lookup.c
+++ b/src/gns/test_gns_simple_lookup.c
@@ -221,7 +221,7 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_NAMESTORE_RecordData rd;
   char* alice_keyfile;
diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c
index f3cfaac27..904758bde 100644
--- a/src/gns/test_gns_simple_mx_lookup.c
+++ b/src/gns/test_gns_simple_mx_lookup.c
@@ -180,8 +180,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
index 600cb0733..679a74dc8 100644
--- a/src/gns/test_gns_simple_shorten.c
+++ b/src/gns/test_gns_simple_shorten.c
@@ -61,8 +61,8 @@ static struct GNUNET_GNS_Handle *gns_handle;
 
 const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded priv_pkey;
-struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded short_pkey;
+struct GNUNET_CRYPTO_EccPublicKey priv_pkey;
+struct GNUNET_CRYPTO_EccPublicKey short_pkey;
 struct GNUNET_CRYPTO_EccPrivateKey *priv_key;
 struct GNUNET_CRYPTO_EccPrivateKey *short_key;
 
@@ -170,9 +170,9 @@ void do_check (void *cls,
               const struct GNUNET_CONFIGURATION_Handle *ccfg,
               struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded our_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey our_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *our_key;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c
index 3b1cd46a0..a403bf554 100644
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ b/src/gns/test_gns_simple_srv_lookup.c
@@ -182,8 +182,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c
index 311282535..c0e3afc8d 100644
--- a/src/gns/test_gns_simple_zkey_lookup.c
+++ b/src/gns/test_gns_simple_zkey_lookup.c
@@ -199,8 +199,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   struct GNUNET_CRYPTO_EccSignature *sig;