From 0912260755021b9b836830dd99ae128c5fd912d9 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 16 Nov 2005 10:45:11 +0000 Subject: [PATCH 1/1] Enable OpenSSL ENGINE, so crypto hardware gets used. Thanks to Andreas van Cranenburgh. --- THANKS | 5 +++-- m4/openssl.m4 | 2 +- src/tincd.c | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/THANKS b/THANKS index 2f097d6a..95c84d13 100644 --- 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 0bc99766..a5cd0394 100644 --- 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 1d44a8ad..2e44d2cc 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -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) { -- 2.20.1