-typo

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

diff --git a/src/util/gnunet-rsa.c b/src/util/gnunet-rsa.c
index fc9d2006402234fc6e1d1cdd427096412c7ae254..e9fbf15dffcbc6af6284bdd578d5311920697dfd 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>
 
 
 /**
@@ -42,6 +43,50 @@ static int print_peer_identity;
  */
 static int print_short_identity;
 
+/**
+ * Use weak random number generator for key generation.
+ */
+static int weak_random;
+
+
+/**
+ * The private information of an RSA key pair.
+ * NOTE: this must match the definition in crypto_ksk.c and crypto_rsa.c!
+ */
+struct GNUNET_CRYPTO_RsaPrivateKey
+{
+  gcry_sexp_t sexp;
+};
+
+
+#if 0
+/**
+ * Create a new private key. Caller must free return value.
+ *
+ * @return fresh private key
+ */
+struct GNUNET_CRYPTO_RsaPrivateKey *
+GNUNET_CRYPTO_rsa_key_create ()
+{
+  struct GNUNET_CRYPTO_RsaPrivateKey *ret;
+  gcry_sexp_t s_key;
+  gcry_sexp_t s_keyparam;
+
+  GNUNET_assert (0 ==
+                 gcry_sexp_build (&s_keyparam, NULL,
+                                  "(genkey(rsa(nbits %d)(rsa-use-e 3:257)))",
+                                  HOSTKEY_LEN));
+  GNUNET_assert (0 == gcry_pk_genkey (&s_key, s_keyparam));
+  gcry_sexp_release (s_keyparam);
+#if EXTRA_CHECKS
+  GNUNET_assert (0 == gcry_pk_testkey (s_key));
+#endif
+  ret = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaPrivateKey));
+  ret->sexp = s_key;
+  return ret;
+}
+#endif
+
 
 /**
  * Main function that will be run by the scheduler.
@@ -64,7 +109,11 @@ run (void *cls, char *const *args, const char *cfgfile,
     fprintf (stderr, _("No hostkey file specified on command line\n"));
     return;
   }
+  if (0 != weak_random)    
+    GNUNET_CRYPTO_random_disable_entropy_gathering ();  
   pk = GNUNET_CRYPTO_rsa_key_create_from_file (args[0]);
+  if (NULL == pk)
+    return;
   if (print_public_key)
   {
     char *s;
@@ -98,7 +147,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 
 /**
- * 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
@@ -117,6 +166,9 @@ main (int argc, char *const *argv)
     { '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 },
+    { 'w', "weak-random", NULL,
+      gettext_noop ("use insecure, weak random number generator for key generation (for testing only)"),
+      0, &GNUNET_GETOPT_set_one, &weak_random },
     GNUNET_GETOPT_OPTION_END
   };