X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=a99b81bc8de82b58013adbc2ad3cc737bacf3577;hp=a220154b79be239d4d5c775ee6124bc4e0ae8922;hb=b4c1d4e2d3287acd7ca438455c64e50a2828ad24;hpb=a26d371d0df3bee1bdc6e9d7046e949ee29e6de7

diff --git a/src/tincd.c b/src/tincd.c
index a220154b..a99b81bc 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.18 2000/10/29 02:07:41 guus Exp $
+    $Id: tincd.c,v 1.10.4.23 2000/10/30 10:19:06 guus Exp $
 */
 
 #include "config.h"
@@ -33,6 +33,7 @@
 #include <signal.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
+#include <openssl/err.h>
 #include <string.h>
 
 #ifdef HAVE_SYS_IOCTL_H
@@ -44,7 +45,6 @@
 #include <xalloc.h>
 
 #include "conf.h"
-#include "encr.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -90,7 +90,7 @@ static struct option const long_options[] =
   { "help", no_argument, &show_help, 1 },
   { "version", no_argument, &show_version, 1 },
   { "no-detach", no_argument, &do_detach, 0 },
-  { "keygen", optional_argument, NULL, 'K'},
+  { "generate-keys", optional_argument, NULL, 'K'},
   { NULL, 0, NULL, 0 }
 };
 
@@ -102,14 +102,14 @@ usage(int status)
   else
     {
       printf(_("Usage: %s [option]...\n\n"), program_name);
-      printf(_("  -c, --config=DIR      Read configuration options from DIR.\n"
-	       "  -D, --no-detach       Don't fork and detach.\n"
-	       "  -d                    Increase debug level.\n"
-	       "  -k, --kill            Attempt to kill a running tincd and exit.\n"
-	       "  -n, --net=NETNAME     Connect to net NETNAME.\n"));
-      printf(_("  -K, --keygen[=BITS]   Generate public/private RSA keypair.\n"
-               "      --help            Display this help and exit.\n"
- 	       "      --version         Output version information and exit.\n\n"));
+      printf(_("  -c, --config=DIR           Read configuration options from DIR.\n"
+	       "  -D, --no-detach            Don't fork and detach.\n"
+	       "  -d                         Increase debug level.\n"
+	       "  -k, --kill                 Attempt to kill a running tincd and exit.\n"
+	       "  -n, --net=NETNAME          Connect to net NETNAME.\n"));
+      printf(_("  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
+               "      --help                 Display this help and exit.\n"
+ 	       "      --version              Output version information and exit.\n\n"));
       printf(_("Report bugs to tinc@nl.linux.org.\n"));
     }
   exit(status);
@@ -205,9 +205,6 @@ int keygen(int bits)
 {
   RSA *rsa_key;
 
-  fprintf(stderr, _("Seeding the PRNG: please press some keys or move\nthe mouse if this program seems to have halted...\n"));
-  RAND_load_file("/dev/random", 1024);	/* OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :) */
-
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
   rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
   if(!rsa_key)
@@ -252,7 +249,7 @@ int detach(void)
       if(pid) /* parent process */
 	{
 	  signal(SIGTERM, parent_exit);
-//	  sleep(600); /* wait 10 minutes */
+	  sleep(600); /* wait 10 minutes */
 	  exit(1);
 	}
     }
@@ -423,6 +420,10 @@ main(int argc, char **argv, char **envp)
 
   make_names();
 
+  /* Slllluuuuuuurrrrp! */
+
+  RAND_load_file("/dev/urandom", 1024);
+
   if(generate_keys)
     exit(keygen(generate_keys));
 
@@ -437,17 +438,16 @@ main(int argc, char **argv, char **envp)
   if(detach())
     exit(0);
 
-/* FIXME: wt* is this suppose to do?
-  if(security_init())
-    return 1;
-*/
+  if(debug_lvl >= DEBUG_ERROR)
+    ERR_load_crypto_strings();
+    
   for(;;)
     {
       if(!setup_network_connections())
         {
           main_loop();
           cleanup_and_exit(1);
-         }
+        }
       
       syslog(LOG_ERR, _("Unrecoverable error"));
       cp_trace();
@@ -470,6 +470,7 @@ sigterm_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got TERM signal"));
+
   cleanup_and_exit(0);
 }
 
@@ -536,11 +537,6 @@ RETSIGTYPE
 sigusr2_handler(int a)
 {
   dump_subnet_list();
-/* FIXME: reprogram this.
-  if(debug_lvl > DEBUG_NOTHING)
-   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
-  regenerate_keys();
-*/
 }
 
 RETSIGTYPE