- verboser log, faster start

[oweals/gnunet.git] / src / util / gnunet-rsa.c

diff --git a/src/util/gnunet-rsa.c b/src/util/gnunet-rsa.c
index bfd854e658a4a6905815a3fd50f04fbfad15d589..ab4bf2cb0fe01ce876bdc3b2a97c3d808d58a619 100644 (file)
--- a/src/util/gnunet-rsa.c
+++ b/src/util/gnunet-rsa.c
@@ -25,6 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include <gcrypt.h>
 
 
 /**
@@ -37,6 +38,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.
@@ -60,6 +66,8 @@ run (void *cls, char *const *args, const char *cfgfile,
     return;
   }
   pk = GNUNET_CRYPTO_rsa_key_create_from_file (args[0]);
+  if (NULL == pk)
+    return;
   if (print_public_key)
   {
     char *s;
@@ -78,19 +86,29 @@ 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);
 }
 
 
 /**
- * The main function to obtain statistics in GNUnet.
+ * Program to manipulate RSA key files.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
  * @return 0 ok, 1 on error
  */
 int
-main (int argc, char *const *argv)
+main (int argc, char *const*argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     { 'p', "print-public-key", NULL,
@@ -99,12 +117,22 @@ 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 ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-rsa [OPTIONS] keyfile",
-                              gettext_noop ("Manipulate GNUnet private RSA key files"),
-                              options, &run, NULL)) ? 0 : 1;
+  int ret;
+
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+
+  ret = (GNUNET_OK ==
+        GNUNET_PROGRAM_run (argc, argv, "gnunet-rsa [OPTIONS] keyfile",
+                            gettext_noop ("Manipulate GNUnet private RSA key files"),
+                            options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-rsa.c */