X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=75788d6fd989be7ae9a6f029175f13d632a755c2;hp=d9512240d23d5a0475265e68d31c99660565c58c;hb=37ed4265fa73d4c06c74362514d78c92029b2f05;hpb=4f9dad0972ac0f665a1b6050b059bd52f93e6221

diff --git a/src/tincd.c b/src/tincd.c
index d9512240..75788d6f 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.47 2001/06/05 16:09:55 guus Exp $
+    $Id: tincd.c,v 1.10.4.50 2001/07/20 13:54:19 guus Exp $
 */
 
 #include "config.h"
@@ -38,31 +38,9 @@
 # include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_OPENSSL_RAND_H
-# include <openssl/rand.h>
-#else
-# include <rand.h>
-#endif
-
-#ifdef HAVE_OPENSSL_RSA_H
-# include <openssl/rsa.h>
-#else
-# include <rsa.h>
-#endif
-
-#ifdef HAVE_OPENSSL_ERR_H
-# include <openssl/err.h>
-#else
-# include <err.h>
-#endif
-
-#ifdef HAVE_OPENSSL_PEM_H
-# include <openssl/pem.h>
-#else
-# include <pem.h>
-#endif
-
-
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
 
 #include <utils.h>
 #include <xalloc.h>
@@ -234,7 +212,7 @@ int keygen(int bits)
 
   if(!rsa_key)
     {
-      fprintf(stderr, _("Error during key generation!"));
+      fprintf(stderr, _("Error during key generation!\n"));
       return -1;
      }
   else
@@ -358,9 +336,6 @@ cp
   if(detach())
     exit(0);
 cp
-  if(debug_lvl >= DEBUG_ERROR)
-    ERR_load_crypto_strings();
-    
   for(;;)
     {
       if(!setup_network_connections())