- tinc now really does public/private key encryption! It even works, whee!

[tinc] / src / genauth.c

diff --git a/src/genauth.c b/src/genauth.c
index 23f9770..78c567d 100644 (file)
--- a/src/genauth.c
+++ b/src/genauth.c
@@ -1,6 +1,7 @@
 /*
-    genauth.c -- generate a random passphrase
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    genauth.c -- generate public/private keypairs
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+                            2000 Guus Sliepen <guus@sliepen.warande.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,6 +16,8 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id: genauth.c,v 1.7.4.4 2000/10/20 15:34:35 guus Exp $
 */
 
 #include "config.h"
@@ -22,63 +25,89 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <openssl/rsa.h>
+#include <openssl/rand.h>
 
 #include <xalloc.h>
 
-#include "encr.h"
+#include "system.h"
+
+#define RSA_PUBLIC_EXPONENT 65535
 
-unsigned char initvec[] = { 0x22, 0x7b, 0xad, 0x55, 0x41, 0xf4, 0x3e, 0xf3 };
+void indicator(int a, int b, void *p)
+{
+  switch(a)
+  {
+    case 0:
+      fprintf(stderr, ".");
+      break;
+    case 1:
+      fprintf(stderr, "+");
+      break;
+    case 2:
+      fprintf(stderr, "-");
+      break;
+    case 3:
+      switch(b)
+        {
+          case 0:
+            fprintf(stderr, " p\n");      
+            break;
+          case 1:
+            fprintf(stderr, " q\n");
+            break;
+          default:
+            fprintf(stderr, "?");
+         }
+       break;
+    default:
+      fprintf(stderr, "?");
+  }
+}
 
 int main(int argc, char **argv)
 {
-  FILE *fp;
-  int bits, c, i, bytes;
-  unsigned char *p;
+  int bits;
+  RSA *key;
 
-  if(argc != 2)
-    {
-      fprintf(stderr, "Usage: %s bits\n", argv[0]);
-      return 1;
-    }
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
 
-  if(!(bits = atol(argv[1])))
+  if(argc > 2 || (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))))
     {
-      fprintf(stderr, "Illegal number: %s\n", argv[1]);
+      fprintf(stderr, _("Usage: %s bits\n"), argv[0]);
       return 1;
     }
 
-  bits = ((bits - 1) | 63) + 1;
-  fprintf(stderr, "Generating %d bits number", bits);
-  bytes = bits >> 3;
+  if(!argv[1])
+    argv[1] = "1024";
+    
+  bits = atol(argv[1]);
 
-  if((fp = fopen("/dev/urandom", "r")) == NULL)
+  if(bits<32)
     {
-      perror("Opening /dev/urandom");
+      fprintf(stderr, _("Illegal number: %s\n"), argv[1]);
       return 1;
     }
+    
+  bits = ((bits - 1) | 7) + 1;         /* Align to bytes for easy mallocing and reading */
 
-  p = xmalloc(bytes);
+  fprintf(stderr, _("Seeding the PRNG: please press some keys or move\nthe mouse if this program seems to have halted...\n"));
 
-  setbuf(stdout, NULL);
-  for(i = 0; i < bytes; i++)
-    {
-      c = fgetc(fp);
-      if(feof(fp))
-        {
-          puts("");
-          fprintf(stderr, "File was empty!\n");
-        }
-      p[i] = c;
-    }
-  fclose(fp);
+  RAND_load_file("/dev/random", 1024); /* OpenSSL PRNG state apparently uses 1024 bytes */
 
-  printf("%d ", bits);
-  for(i = 0; i < bytes; i++)
-    printf("%02x", p[i]);
-  puts("");
-  fprintf(stderr, ": done.\n");
+  fprintf(stderr, _("Generating %d bits keys:\n"), bits);
 
-  return 0;
-}
+  key = RSA_generate_key(bits, RSA_PUBLIC_EXPONENT, indicator, NULL);
 
+  fprintf(stderr, _("Done.\n"));
 
+  printf(_("Public key:  %s\n"), BN_bn2hex(key->n));
+  printf(_("Private key: %s\n"), BN_bn2hex(key->d));
+  printf(_("Public exp:  %s\n"), BN_bn2hex(key->e));
+
+  fflush(stdin);       /* Flush any input caused by random keypresses */
+
+  return 0;
+}