Enable OpenSSL ENGINE, so crypto hardware gets used. Thanks to Andreas van Cranenburgh.

diff --git a/THANKS b/THANKS
index 2f097d6af4a58969f1423ef24da7be1e7124e19c..95c84d132bea9f303f6530223dc936e653aaa176 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ We would like to thank the following people for their contributions to tinc:
 
 * Alexander Reil and Gemeinde Berg
 * Allesandro Gatti
+* Andreas van Cranenburgh
 * Armijn Hemel
 * Cris van Pelt
 * Enrique Zanardi
@@ -13,7 +14,7 @@ We would like to thank the following people for their contributions to tinc:
 * Jason Harper
 * Jeroen Ubbink
 * Jerome Etienne
-* Lubomír Bulej
+* Lubomír Bulej
 * Mads Kiilerich
 * Marc A. Lehmann
 * Mark Glines
@@ -27,7 +28,7 @@ We would like to thank the following people for their contributions to tinc:
 * Wessel Dankers
 * Wouter van Heyst
 
-And everyone we forgot. Thank you guys!
+And everyone we forgot. Thank you!
 
 Ivo Timmermans
 Guus Sliepen

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 0bc99766796c468ef8098893729385bc5945a568..a5cd0394dbafd3a5dccf3306c5fba75f834caf15 100644 (file)
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -21,7 +21,7 @@ AC_DEFUN([tinc_OPENSSL],
      LDFLAGS="$LDFLAGS -L$withval"]
   )
 
-  AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h,
+  AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h openssl/engine.h,
     [],
     [AC_MSG_ERROR([OpenSSL header files not found.]); break]
   )

diff --git a/src/tincd.c b/src/tincd.c
index 1d44a8ad66500ccd279c7a041af379419ebdd2fe..2e44d2ccedacd0cc695867bb084906470f908644 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -35,6 +35,7 @@
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
+#include <openssl/engine.h>
 
 #include <lzo1x.h>
 
@@ -448,6 +449,9 @@ int main(int argc, char **argv)
 
        RAND_load_file("/dev/urandom", 1024);
 
+       ENGINE_load_builtin_engines();
+       ENGINE_register_all_complete();
+
        OpenSSL_add_all_algorithms();
 
        if(generate_keys) {