-eliminate ShortHashCode residuals (#2936)

2 files changed, 3 insertions, 37 deletions

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 4552e860e..6c27b88a3 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -259,15 +259,6 @@ struct GNUNET_HashCode
 
 
 /**
- * @brief A SHA-256 hashcode
- */
-struct GNUNET_CRYPTO_ShortHashCode
-{
-  uint32_t bits[256 / 8 / sizeof (uint32_t)];   /* = 8 */
-};
-
-
-/**
  * The identity of the host (basically the SHA-512 hashcode of
  * it's public key).
  */
@@ -505,33 +496,6 @@ GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
 
 /**
  * @ingroup logging
- * Convert a short hash value to a string (for printing debug messages).
- * This is one of the very few calls in the entire API that is
- * NOT reentrant!
- *
- * @param hc the short hash code
- * @return string
- */
-const char *
-GNUNET_short_h2s (const struct GNUNET_CRYPTO_ShortHashCode * hc);
-
-
-/**
- * @ingroup logging
- * Convert a short hash value to a string (for printing debug messages).
- * This prints all 104 characters of a hashcode!
- * This is one of the very few calls in the entire API that is
- * NOT reentrant!
- *
- * @param hc the short hash code
- * @return string
- */
-const char *
-GNUNET_short_h2s_full (const struct GNUNET_CRYPTO_ShortHashCode * hc);
-
-
-/**
- * @ingroup logging
  * Convert a hash value to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 527e46eb9..7149a5206 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -511,7 +511,7 @@ zone_to_name_cb (void *cls,
 {
   struct Request *request = cls;
   struct GNUNET_NAMESTORE_RecordData r;
-  struct GNUNET_CRYPTO_ShortHashCode pub;
+  struct GNUNET_CRYPTO_EccPublicSignKey pub;
   
   request->qe = NULL;
   if (NULL != name)
@@ -523,6 +523,8 @@ zone_to_name_cb (void *cls,
     run_httpd_now ();
     return;
   }
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (zone_key,
+                                                  &pub);
   r.data = &pub;
   r.data_size = sizeof (pub);
   r.expiration_time = UINT64_MAX;