15 files changed, 70 insertions, 70 deletions

diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 041b046ba..527e46eb9 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -552,7 +552,7 @@ lookup_result_processor (void *cls,
                          const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   struct Request *request = cls;
-  struct GNUNET_CRYPTO_EccPublicKey pub;
+  struct GNUNET_CRYPTO_EccPublicSignKey pub;
   
   if (0 != rd_count)
   {
@@ -565,7 +565,7 @@ lookup_result_processor (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_ecc_public_key_from_string (request->public_key,
+      GNUNET_CRYPTO_ecc_public_sign_key_from_string (request->public_key,
                                                 strlen (request->public_key),
                                                 &pub))
   {
@@ -594,7 +594,7 @@ lookup_block_processor (void *cls,
                         const struct GNUNET_NAMESTORE_Block *block)
 {
   struct Request *request = cls;
-  struct GNUNET_CRYPTO_EccPublicKey pub;
+  struct GNUNET_CRYPTO_EccPublicSignKey pub;
 
   request->qe = NULL;
   if (NULL == block)
@@ -602,7 +602,7 @@ lookup_block_processor (void *cls,
     lookup_result_processor (request, 0, NULL);
     return;
   }
-  GNUNET_CRYPTO_ecc_key_get_public (&fcfs_zone_pkey,
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (&fcfs_zone_pkey,
                                     &pub);
   if (GNUNET_OK != 
       GNUNET_NAMESTORE_block_decrypt (block,
@@ -655,7 +655,7 @@ create_response (void *cls,
   struct MHD_Response *response;
   struct Request *request;
   int ret;
-  struct GNUNET_CRYPTO_EccPublicKey pub;
+  struct GNUNET_CRYPTO_EccPublicSignKey pub;
   struct GNUNET_HashCode query;
 
   if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) ||
@@ -705,7 +705,7 @@ create_response (void *cls,
         request->pp = NULL;
       }
       if (GNUNET_OK !=
-          GNUNET_CRYPTO_ecc_public_key_from_string (request->public_key,
+          GNUNET_CRYPTO_ecc_public_sign_key_from_string (request->public_key,
                                                     strlen (request->public_key),
                                                     &pub))
       {
@@ -733,7 +733,7 @@ create_response (void *cls,
                                  request, connection);
           }
           request->phase = RP_LOOKUP;
-          GNUNET_CRYPTO_ecc_key_get_public (&fcfs_zone_pkey,
+          GNUNET_CRYPTO_ecc_key_get_public_for_signature (&fcfs_zone_pkey,
                                             &pub);
           GNUNET_NAMESTORE_query_from_public_key (&pub,
                                                   request->domain_name,
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index aadf741ad..fb9b017b1 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -430,7 +430,7 @@ testservice_task (void *cls,
                   int result)
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-  struct GNUNET_CRYPTO_EccPublicKey pub;
+  struct GNUNET_CRYPTO_EccPublicSignKey pub;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   if (GNUNET_YES != result)
@@ -446,7 +446,7 @@ testservice_task (void *cls,
              _("No options given\n"));
     return; 
   }
-  GNUNET_CRYPTO_ecc_key_get_public (&zone_pkey,
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (&zone_pkey,
                                     &pub);
 
   ns = GNUNET_NAMESTORE_connect (cfg);
@@ -575,14 +575,14 @@ testservice_task (void *cls,
   {
     char sh[105];
     char sname[64];
-    struct GNUNET_CRYPTO_EccPublicKey pkey;
+    struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
     if ( (2 != (sscanf (uri,
                         "gnunet://gns/%104s/%63s",
                         sh,
                         sname)) ) ||
          (GNUNET_OK !=
-          GNUNET_CRYPTO_ecc_public_key_from_string (sh, strlen (sh), &pkey)) )
+          GNUNET_CRYPTO_ecc_public_sign_key_from_string (sh, strlen (sh), &pkey)) )
     {
       fprintf (stderr, 
                _("Invalid URI `%s'\n"),
@@ -593,7 +593,7 @@ testservice_task (void *cls,
     }
     memset (&rd, 0, sizeof (rd));
     rd.data = &pkey;
-    rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
+    rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
     rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
     if (GNUNET_YES == etime_is_rel)
     {
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index fda19cacf..f113040b5 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -573,7 +573,7 @@ handle_record_store (void *cls,
   const char *rd_ser;
   unsigned int rd_count;
   int res;
-  struct GNUNET_CRYPTO_EccPublicKey pubkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
               "Received `%s' message\n", 
@@ -624,7 +624,7 @@ handle_record_store (void *cls,
         }
 
     /* Extracting and converting private key */
-    GNUNET_CRYPTO_ecc_key_get_public (&rp_msg->private_key,
+    GNUNET_CRYPTO_ecc_key_get_public_for_signature (&rp_msg->private_key,
                                       &pubkey);
     conv_name = GNUNET_NAMESTORE_normalize_string (name_tmp);
     if (NULL == conv_name)
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index 7d406df61..61691b95e 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -93,7 +93,7 @@ struct LookupBlockResponseMessage
   /**
    * Derived public key.
    */
-  struct GNUNET_CRYPTO_EccPublicKey derived_key;
+  struct GNUNET_CRYPTO_EccPublicSignKey derived_key;
 
   /* follwed by encrypted block data */
 };
@@ -122,7 +122,7 @@ struct BlockCacheMessage
   /**
    * Derived public key.
    */
-  struct GNUNET_CRYPTO_EccPublicKey derived_key;
+  struct GNUNET_CRYPTO_EccPublicSignKey derived_key;
 
   /* follwed by encrypted block data */
 };
@@ -228,7 +228,7 @@ struct ZoneToNameMessage
   /**
    * The public key of the target zone  
    */
-  struct GNUNET_CRYPTO_EccPublicKey value_zone;
+  struct GNUNET_CRYPTO_EccPublicSignKey value_zone;
 };
 
 
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index a57aa2967..acb658665 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -1146,7 +1146,7 @@ GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
 struct GNUNET_NAMESTORE_QueueEntry *
 GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
                                const struct GNUNET_CRYPTO_EccPrivateKey *zone,
-                               const struct GNUNET_CRYPTO_EccPublicKey *value_zone,
+                               const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
                                GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls)
 {
   struct GNUNET_NAMESTORE_QueueEntry *qe;
diff --git a/src/namestore/namestore_api_common.c b/src/namestore/namestore_api_common.c
index dec6acafe..f752b18c3 100644
--- a/src/namestore/namestore_api_common.c
+++ b/src/namestore/namestore_api_common.c
@@ -97,13 +97,13 @@ GNUNET_NAMESTORE_normalize_string (const char *src)
  * @return string form; will be overwritten by next call to #GNUNET_NAMESTORE_z2s
  */
 const char *
-GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EccPublicKey *z)
+GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EccPublicSignKey *z)
 {
-  static char buf[sizeof (struct GNUNET_CRYPTO_EccPublicKey) * 8];
+  static char buf[sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) * 8];
   char *end;
 
   end = GNUNET_STRINGS_data_to_string ((const unsigned char *) z, 
-                                       sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                                       sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
                                        buf, sizeof (buf));
   if (NULL == end)
   {
@@ -324,18 +324,18 @@ static void
 derive_block_aes_key (struct GNUNET_CRYPTO_AesInitializationVector *iv,
                       struct GNUNET_CRYPTO_AesSessionKey *skey,
                       const char *label,
-                      const struct GNUNET_CRYPTO_EccPublicKey *pub)
+                      const struct GNUNET_CRYPTO_EccPublicSignKey *pub)
 {
   static const char ctx_key[] = "gns-aes-ctx-key";
   static const char ctx_iv[] = "gns-aes-ctx-iv";
 
   GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_AesSessionKey),
-                     pub, sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                     pub, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
                      label, strlen (label),
                      ctx_key, strlen (ctx_key),
                      NULL, 0);
   GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_AesInitializationVector),
-                     pub, sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                     pub, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
                      label, strlen (label),
                      ctx_iv, strlen (ctx_iv),
                      NULL, 0);
@@ -362,7 +362,7 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
   size_t payload_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
   char payload[sizeof (uint32_t) + payload_len];
   struct GNUNET_NAMESTORE_Block *block;
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *dkey;
   struct GNUNET_CRYPTO_AesInitializationVector iv;
   struct GNUNET_CRYPTO_AesSessionKey skey;
@@ -385,9 +385,9 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
   dkey = GNUNET_CRYPTO_ecc_key_derive (key,
                                        label,
                                        "gns");
-  GNUNET_CRYPTO_ecc_key_get_public (dkey,
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (dkey,
                                     &block->derived_key);
-  GNUNET_CRYPTO_ecc_key_get_public (key,
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (key,
                                     &pkey);
   derive_block_aes_key (&iv, &skey, label, &pkey);
   GNUNET_break (payload_len + sizeof (uint32_t) ==
@@ -439,7 +439,7 @@ GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block)
  */
 int
 GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block,
-                                const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+                                const struct GNUNET_CRYPTO_EccPublicSignKey *zone_key,
                                 const char *label,
                                 GNUNET_NAMESTORE_RecordCallback proc,
                                 void *proc_cls)
@@ -580,7 +580,7 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
       return NULL;
     return GNUNET_strdup (tmp);
   case GNUNET_NAMESTORE_TYPE_PKEY:
-    if (data_size != sizeof (struct GNUNET_CRYPTO_EccPublicKey))
+    if (data_size != sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))
       return NULL;
     return GNUNET_CRYPTO_ecc_public_key_to_string (data);
   case GNUNET_NAMESTORE_TYPE_PSEU:
@@ -664,7 +664,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
 {
   struct in_addr value_a;
   struct in6_addr value_aaaa;
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_TUN_DnsSoaRecord *soa;
   struct GNUNET_TUN_GnsVpnRecord *vpn;
   struct GNUNET_TUN_DnsTlsaRecord *tlsa;
@@ -769,16 +769,16 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
     return GNUNET_OK;
   case GNUNET_NAMESTORE_TYPE_PKEY:
     if (GNUNET_OK !=
-        GNUNET_CRYPTO_ecc_public_key_from_string (s, strlen (s), &pkey))
+        GNUNET_CRYPTO_ecc_public_sign_key_from_string (s, strlen (s), &pkey))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _("Unable to parse PKEY record `%s'\n"),
                   s);
       return GNUNET_SYSERR;
     }
-    *data = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
+    *data = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey);
     memcpy (*data, &pkey, sizeof (pkey));
-    *data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
+    *data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
     return GNUNET_OK;
   case GNUNET_NAMESTORE_TYPE_PSEU:
     *data = GNUNET_strdup (s);
@@ -928,9 +928,9 @@ GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKe
                                          const char *label,
                                          struct GNUNET_HashCode *query)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pub;
+  struct GNUNET_CRYPTO_EccPublicSignKey pub;
 
-  GNUNET_CRYPTO_ecc_key_get_public (zone, &pub);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (zone, &pub);
   GNUNET_NAMESTORE_query_from_public_key (&pub, label, query);
 }
 
@@ -943,11 +943,11 @@ GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKe
  * @param query hash to use for the query
  */
 void
-GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EccPublicKey *pub,
+GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pub,
                                         const char *label,
                                         struct GNUNET_HashCode *query)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pd;
+  struct GNUNET_CRYPTO_EccPublicSignKey pd;
 
   GNUNET_CRYPTO_ecc_public_key_derive (pub, label, "gns", &pd);
   GNUNET_CRYPTO_hash (&pd, sizeof (pd), query);
@@ -965,7 +965,7 @@ GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EccPublicKey
  *         key in an encoding suitable for DNS labels.
  */
 const char *
-GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicKey *pkey)
+GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
 {
   static char ret[128];
   char *pkeys;
@@ -991,7 +991,7 @@ GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicKey *pkey)
  */
 int
 GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey,
-                               struct GNUNET_CRYPTO_EccPublicKey *pkey)
+                               struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
 {
   char *cpy;
   char *dot;
@@ -1007,7 +1007,7 @@ GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey,
     goto error;
 
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_ecc_public_key_from_string (x,
+      GNUNET_CRYPTO_ecc_public_sign_key_from_string (x,
                                                 strlen (x),
                                                 pkey))
     goto error;
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 546653d90..fba2b47b4 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -273,7 +273,7 @@ namestore_postgres_remove_records (void *cls,
  */
 static int 
 namestore_postgres_put_records (void *cls, 
-                                const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+                                const struct GNUNET_CRYPTO_EccPublicSignKey *zone_key,
                                 struct GNUNET_TIME_Absolute expire,
                                 const char *name,
                                 unsigned int rd_count,
@@ -291,7 +291,7 @@ namestore_postgres_put_records (void *cls,
   unsigned int i;
 
   GNUNET_CRYPTO_short_hash (zone_key, 
-                            sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                            sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
                             &zone);
   (void) namestore_postgres_remove_records (plugin, &zone, name);
   name_len = strlen (name);
@@ -331,7 +331,7 @@ namestore_postgres_put_records (void *cls,
       (const char *) &rvalue_be
     };
     int paramLengths[] = {
-      sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+      sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
       name_len,
       sizeof (uint32_t),
       data_size,
@@ -383,7 +383,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
 {
   unsigned int record_count;
   size_t data_size;
-  /* const struct GNUNET_CRYPTO_EccPublicKey *zone_key; */
+  /* const struct GNUNET_CRYPTO_EccPublicSignKey *zone_key; */
   const struct GNUNET_CRYPTO_EccPrivateKey *zone_key;
   /* const struct GNUNET_CRYPTO_EccSignature *sig; */
   /* struct GNUNET_TIME_Absolute expiration; */
@@ -413,7 +413,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
   }
   GNUNET_assert (1 == cnt);
   if ((6 != PQnfields (res)) || 
-      (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != PQgetlength (res, 0, 0)) || 
+      (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != 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)))
@@ -423,7 +423,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
     return GNUNET_SYSERR;
   }
   zone_key = (const struct GNUNET_CRYPTO_EccPrivateKey *) PQgetvalue (res, 0, 0);
-  /* zone_key = (const struct GNUNET_CRYPTO_EccPublicKey *) PQgetvalue (res, 0, 0); */
+  /* zone_key = (const struct GNUNET_CRYPTO_EccPublicSignKey *) PQgetvalue (res, 0, 0); */
   name = PQgetvalue (res, 0, 1);
   name_len = PQgetlength (res, 0, 1);
   record_count = ntohl (*(uint32_t *) PQgetvalue (res, 0, 2));
@@ -563,7 +563,7 @@ namestore_postgres_iterate_records (void *cls,
 static int
 namestore_postgres_zone_to_name (void *cls, 
                                const struct GNUNET_CRYPTO_EccPrivateKey *zone,
-                               const struct GNUNET_CRYPTO_EccPublicKey *value_zone,
+                               const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
                                GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
 {
 #if  0
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index d062c81a1..6551dd4a2 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -455,11 +455,11 @@ namestore_sqlite_cache_block (void *cls,
 
   namestore_sqlite_expire_blocks (plugin);
   GNUNET_CRYPTO_hash (&block->derived_key, 
-                      sizeof (struct GNUNET_CRYPTO_EccPublicKey), 
+                      sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 
                       &query);
   expiration = GNUNET_TIME_absolute_ntoh (block->expiration_time);
   block_size = ntohl (block->purpose.size) + 
-    sizeof (struct GNUNET_CRYPTO_EccPublicKey) + 
+    sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + 
     sizeof (struct GNUNET_CRYPTO_EccSignature); 
   if (block_size > 64 * 65536)
   {
@@ -542,7 +542,7 @@ namestore_sqlite_lookup_block (void *cls,
     block_size = sqlite3_column_bytes (plugin->lookup_block, 0);
     if ( (block_size < sizeof (struct GNUNET_NAMESTORE_Block)) ||
          (ntohl (block->purpose.size) + 
-          sizeof (struct GNUNET_CRYPTO_EccPublicKey) + 
+          sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + 
           sizeof (struct GNUNET_CRYPTO_EccSignature) != block_size) )
     {
       GNUNET_break (0);
@@ -599,7 +599,7 @@ namestore_sqlite_store_records (void *cls,
   for (i=0;i<rd_count;i++)
     if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
     {
-      GNUNET_break (sizeof (struct GNUNET_CRYPTO_EccPublicKey) == rd[i].data_size);
+      GNUNET_break (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) == rd[i].data_size);
       GNUNET_CRYPTO_hash (rd[i].data,
                           rd[i].data_size,
                           &pkey_hash);
@@ -834,7 +834,7 @@ namestore_sqlite_iterate_records (void *cls,
 static int
 namestore_sqlite_zone_to_name (void *cls, 
                                const struct GNUNET_CRYPTO_EccPrivateKey *zone,
-                               const struct GNUNET_CRYPTO_EccPublicKey *value_zone,
+                               const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
                                GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
 {
   struct Plugin *plugin = cls;
@@ -845,7 +845,7 @@ namestore_sqlite_zone_to_name (void *cls,
                                         zone, sizeof (struct GNUNET_CRYPTO_EccPrivateKey),
                                         SQLITE_STATIC)) ||
        (SQLITE_OK != sqlite3_bind_blob (stmt, 2, 
-                                        value_zone, sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                                        value_zone, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
                                         SQLITE_STATIC)) )
   {
     LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
diff --git a/src/namestore/test_namestore_api_blocks.c b/src/namestore/test_namestore_api_blocks.c
index 446a28c18..d7057fc8f 100644
--- a/src/namestore/test_namestore_api_blocks.c
+++ b/src/namestore/test_namestore_api_blocks.c
@@ -101,7 +101,7 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_NAMESTORE_Block *block;
-  struct GNUNET_CRYPTO_EccPublicKey pubkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
   /* load privat key */
   char *hostkey_file;
@@ -113,7 +113,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_assert (privkey != NULL);
   struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get();
   /* get public key */
-  GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature(privkey, &pubkey);
 
   /* create record */
   s_name = "DUMMY.dummy.gnunet";
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c
index f5adc7d85..6c7ca6b0f 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_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
 static struct GNUNET_NAMESTORE_RecordData *s_rd;
 
@@ -151,7 +151,7 @@ run (void *cls,
   GNUNET_assert (privkey != NULL);
   GNUNET_free (hostkey_file);
   /* get public key */
-  GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature(privkey, &pubkey);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
   /* create record */
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 22ab2bca4..0b027b7e1 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -41,7 +41,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
 static struct GNUNET_HashCode derived_hash;
 
@@ -263,7 +263,7 @@ run (void *cls,
   privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
-  GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey);
 
   removed = GNUNET_NO;
 
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 396e69ff0..7c4dcc253 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -41,7 +41,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
 static int res;
 
@@ -152,7 +152,7 @@ run (void *cls,
   privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
-  GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey);
 
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c
index b85003c60..00a3a1a1c 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -41,7 +41,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
 static int res;
 
@@ -185,7 +185,7 @@ run (void *cls,
   privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
-  GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey);
 
 
   rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index 9455c6bd6..e36272fca 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -48,7 +48,7 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
 static int res;
 
@@ -222,7 +222,7 @@ run (void *cls,
   privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
-  GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey);
 
 
   rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 5e6cf5a4e..31a8eafa3 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_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey 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_EccPublicKey *zone_key,
+                   const struct GNUNET_CRYPTO_EccPublicSignKey *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_EccPublicKey))))
+    if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))))
     {
       fail = GNUNET_YES;
       GNUNET_break (0);
@@ -179,10 +179,10 @@ run (void *cls,
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
   /* get public key */
-  GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature(privkey, &pubkey);
 
   /* zone hash */
-  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
+  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), &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));