[GNUnet-SVN] r28713 - in gnunet: doc/man src/fs

[gnunet]

Author: grothoff
Date: 2013-08-19 21:11:14 +0200 (Mon, 19 Aug 2013)
New Revision: 28713

Modified:
   gnunet/doc/man/gnunet-ecc.1
   gnunet/src/fs/fs_namespace.c
Log:
-remove more uses of short hash

Modified: gnunet/doc/man/gnunet-ecc.1
===================================================================
--- gnunet/doc/man/gnunet-ecc.1 2013-08-19 19:10:59 UTC (rev 28712)
+++ gnunet/doc/man/gnunet-ecc.1 2013-08-19 19:11:14 UTC (rev 28713)
@@ -17,14 +17,11 @@
 Create COUNT public-private key pairs and write them to FILENAME.  Used for 
creating a file for testing.
 .B
 .IP "\-p, \-\-print-public-key"
-Print the corresponding public key to stdout.
+Print the corresponding public key to stdout.  This is the value used for PKEY 
records in GNS.
 .B
 .IP "\-P, \-\-print-peer-identity"
 Print the corresponding peer identity (hash of the public key) to stdout.  
This hash is used for the name of peers.
 .B
-.IP "\-s, \-\-print-short-identity"
-Print the corresponding short hash (256-bit hash of the public key) to stdout. 
 This hash is used for names in the zkey zone.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
 .B

Modified: gnunet/src/fs/fs_namespace.c
===================================================================
--- gnunet/src/fs/fs_namespace.c        2013-08-19 19:10:59 UTC (rev 28712)
+++ gnunet/src/fs/fs_namespace.c        2013-08-19 19:11:14 UTC (rev 28713)
@@ -132,8 +132,8 @@
   char *dn;
   char *ret;
   struct GNUNET_CRYPTO_EccPublicKey pub;
-  struct GNUNET_CRYPTO_ShortHashCode hc;
-  struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
+  struct GNUNET_HashCode hc;
+  struct GNUNET_CRYPTO_HashAsciiEncoded enc;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (h->cfg, "FS", "UPDATE_DIR",
@@ -144,13 +144,13 @@
     return NULL;
   }
   GNUNET_CRYPTO_ecc_key_get_public (ns, &pub);
-  GNUNET_CRYPTO_short_hash (&pub, sizeof (pub), &hc);
-  GNUNET_CRYPTO_short_hash_to_enc (&hc,
-                                  &enc);
+  GNUNET_CRYPTO_hash (&pub, sizeof (pub), &hc);
+  GNUNET_CRYPTO_hash_to_enc (&hc,
+                            &enc);
   GNUNET_asprintf (&ret, "%s%s%s", 
                   dn, 
                   DIR_SEPARATOR_STR, 
-                  (const char *) enc.short_encoding);
+                  (const char *) enc.encoding);
   GNUNET_free (dn);
   return ret;
 }