[GNUnet-SVN] r33912 - in gnunet/src: cadet util

[gnunet]

Author: bartpolot
Date: 2014-07-03 15:25:01 +0200 (Thu, 03 Jul 2014)
New Revision: 33912

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
   gnunet/src/util/gnunet-ecc.c
Log:
Since we started using ECC, peer identities ARE public keys, not their hashes. 
This commit removes the miss-documented, redundant option and the duplicate 
code associated to its handling.

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-07-03 13:25:00 UTC 
(rev 33911)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-07-03 13:25:01 UTC 
(rev 33912)
@@ -885,7 +885,7 @@
 
 
 /**
- * Destroy a Key eXchane context for the tunnel. This function only schedules
+ * Destroy a Key eXchange context for the tunnel. This function only schedules
  * the destruction, the freeing of the memory (and clearing of old key 
material)
  * happens after a delay!
  *

Modified: gnunet/src/util/gnunet-ecc.c
===================================================================
--- gnunet/src/util/gnunet-ecc.c        2014-07-03 13:25:00 UTC (rev 33911)
+++ gnunet/src/util/gnunet-ecc.c        2014-07-03 13:25:01 UTC (rev 33912)
@@ -51,11 +51,6 @@
 static int print_examples_flag;
 
 /**
- * Flag for printing hash of public key.
- */
-static int print_peer_identity;
-
-/**
  * Option set to create a bunch of keys at once.
  */
 static unsigned int make_keys;
@@ -359,23 +354,6 @@
   }
   if (print_public_key)
   {
-    struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
-    struct GNUNET_CRYPTO_EddsaPublicKey pub;
-    char *s;
-
-    pk = GNUNET_CRYPTO_eddsa_key_create_from_file (args[0]);
-    if (NULL == pk)
-      return;
-    GNUNET_CRYPTO_eddsa_key_get_public (pk, &pub);
-    s = GNUNET_CRYPTO_eddsa_public_key_to_string (&pub);
-    FPRINTF (stdout,
-             "%s\n",
-             s);
-    GNUNET_free (s);
-    GNUNET_free (pk);
-  }
-  if (print_peer_identity)
-  {
     char *str;
     struct GNUNET_DISK_FileHandle *keyfile;
     struct GNUNET_CRYPTO_EddsaPrivateKey pk;
@@ -422,9 +400,6 @@
     { 'p', "print-public-key", NULL,
       gettext_noop ("print the public key in ASCII format"),
       0, &GNUNET_GETOPT_set_one, &print_public_key },
-    { 'P', "print-peer-identity", NULL,
-      gettext_noop ("print the hash of the public key in ASCII format"),
-      0, &GNUNET_GETOPT_set_one, &print_peer_identity },
     { 'E', "examples", NULL,
       gettext_noop ("print examples of ECC operations (used for compatibility 
testing)"),
       0, &GNUNET_GETOPT_set_one, &print_examples_flag },