1 files changed, 18 insertions, 0 deletions

diff --git a/src/util/gnunet-rsa.c b/src/util/gnunet-rsa.c
index bfd854e65..f3cd83a8b 100644
--- a/src/util/gnunet-rsa.c
+++ b/src/util/gnunet-rsa.c
@@ -37,6 +37,11 @@ static int print_public_key;
  */
 static int print_peer_identity;
 
+/**
+ * Flag for printing short hash of public key.
+ */
+static int print_short_identity;
+
 
 /**
  * Main function that will be run by the scheduler.
@@ -78,6 +83,16 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_CRYPTO_hash_to_enc (&pid.hashPubKey, &enc);
     fprintf (stdout, "%s\n", enc.encoding);
   }
+  if (print_short_identity)
+  {
+    struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
+    struct GNUNET_CRYPTO_ShortHashCode sh;
+
+    GNUNET_CRYPTO_rsa_key_get_public (pk, &pub);
+    GNUNET_CRYPTO_short_hash (&pub, sizeof (pub), &sh);
+    GNUNET_CRYPTO_short_hash_to_enc (&sh, &enc);
+    fprintf (stdout, "%s\n", enc.short_encoding);
+  }
   GNUNET_CRYPTO_rsa_key_free (pk);
 }
 
@@ -99,6 +114,9 @@ main (int argc, char *const *argv)
     { '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 },
+    { 's', "print-short-identity", NULL,
+      gettext_noop ("print the short hash of the public key in ASCII format"),
+      0, &GNUNET_GETOPT_set_one, &print_short_identity },
     GNUNET_GETOPT_OPTION_END
   };
   return (GNUNET_OK ==