Another file moved; random interface stuff.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 4e766a8..c732b7c 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.14 2002/04/13 11:07:12 zarq Exp $
+    $Id: tincd.c,v 1.16 2002/05/02 11:50:07 zarq Exp $
 */
 
 #include "config.h"
@@ -37,15 +37,22 @@
 # include <sys/ioctl.h>
 #endif
 
+#ifdef USE_OPENSSL
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
+#endif
+
+#ifdef USE_GCRYPT
+#include <gcrypt.h>
+#endif
 
 #include <utils.h>
 #include <xalloc.h>
 
-#include "conf.h"
+#include "callbacks.h"
+#include "read_conf.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
@@ -231,6 +238,7 @@ void indicator(int a, int b, void *p)
   }
 }
 
+#ifdef USE_OPENSSL
 /*
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
@@ -283,6 +291,7 @@ int keygen(int bits)
 
   return 0;
 }
+#endif
 
 /*
   Set all files and paths according to netname
@@ -347,6 +356,7 @@ main(int argc, char **argv, char **envp)
 
   /* Slllluuuuuuurrrrp! */
 cp
+#ifdef USE_OPENSSL
   RAND_load_file("/dev/urandom", 1024);
 
 #ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS
@@ -361,6 +371,7 @@ cp
       read_server_config();
       exit(keygen(generate_keys));
     }
+#endif
 
   if(kill_tincd)
     exit(kill_other(kill_tincd));
@@ -370,6 +381,8 @@ cp
 cp
   if(detach())
     exit(0);
+
+  init_callbacks();
 cp
   for(;;)
     {