- Let user choose whether keys are in the config files or separate

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index f98afe4..535fdb3 100644 (file)
--- 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.35 2000/11/24 23:13:07 guus Exp $
+    $Id: tincd.c,v 1.10.4.39 2001/01/05 23:53:53 guus Exp $
 */
 
 #include "config.h"
@@ -56,6 +56,12 @@
 # include <err.h>
 #endif
 
+#ifdef HAVE_OPENSSL_PEM_H
+# include <openssl/pem.h>
+#else
+# include <pem.h>
+#endif
+
 
 
 #include <utils.h>
@@ -147,7 +153,10 @@ parse_options(int argc, char **argv, char **envp)
          do_detach = 0;
          break;
        case 'd': /* inc debug level */
-         debug_lvl++;
+         if(optarg)
+           debug_lvl = atoi(optarg);
+         else
+           debug_lvl++;
          break;
        case 'k': /* kill old tincds */
          kill_tincd = 1;
@@ -162,7 +171,8 @@ parse_options(int argc, char **argv, char **envp)
               generate_keys = atoi(optarg);
               if(generate_keys < 512)
                 {
-                  fprintf(stderr, _("Invalid argument! BITS must be a number equal to or greater than 512.\n"));
+                  fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
+                         optarg);
                   usage(1);
                 }
               generate_keys &= ~7;     /* Round it to bytes */
@@ -211,11 +221,14 @@ void indicator(int a, int b, void *p)
   }
 }
 
-/* Generate a public/private RSA keypair, and possibly store it into the configuration file. */
-
+/*
+  Generate a public/private RSA keypair, and ask for a file to store
+  them in.
+*/
 int keygen(int bits)
 {
   RSA *rsa_key;
+  FILE *f;
 
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
   rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
@@ -227,11 +240,16 @@ int keygen(int bits)
   else
     fprintf(stderr, _("Done.\n"));
 
-  fprintf(stderr, _("Please copy the private key to tinc.conf and the\npublic key to your host configuration file:\n\n"));
-  printf("PublicKey = %s\n", BN_bn2hex(rsa_key->n));
-  printf("PrivateKey = %s\n", BN_bn2hex(rsa_key->d));
+  if((f = ask_and_safe_open("rsa_key.pub", _("public RSA key"))) == NULL)
+    return -1;
+  PEM_write_RSAPublicKey(f, rsa_key);
+  fclose(f);
   
-  fflush(stdin);
+  if((f = ask_and_safe_open("rsa_key.priv", _("private RSA key"))) == NULL)
+    return -1;
+  PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
+  fclose(f);
+
   return 0;
 }
 
@@ -265,6 +283,8 @@ void make_names(void)
 int
 main(int argc, char **argv, char **envp)
 {
+  openlog("tinc", LOG_PERROR, LOG_DAEMON);     /* Catch all syslog() calls issued before detaching */
+
   program_name = argv[0];
 
   setlocale (LC_ALL, "");
@@ -304,9 +324,9 @@ main(int argc, char **argv, char **envp)
   make_names();
 
   /* Slllluuuuuuurrrrp! */
-
+cp
   RAND_load_file("/dev/urandom", 1024);
-
+cp
   if(generate_keys)
     exit(keygen(generate_keys));
 
@@ -315,10 +335,10 @@ main(int argc, char **argv, char **envp)
 
   if(read_server_config())
     return 1;
-
+cp
   if(detach())
     exit(0);
-
+cp
   if(debug_lvl >= DEBUG_ERROR)
     ERR_load_crypto_strings();