Merge branch 'master' into saverio

[meshlink] / m4 / openssl.m4

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 254ea4ff2424531ee06b430de374c22b1e063efe..fba06fd3ebcf3844ceba5c9a552fd13821f33bc9 100644 (file)
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -1,6 +1,6 @@
 dnl Check to find the OpenSSL headers/libraries
 
-AC_DEFUN([tinc_OPENSSL],
+AC_DEFUN([MeshLink_OPENSSL],
 [
   case $host_os in
     *mingw*)
@@ -35,7 +35,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 openssl/engine.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 openssl/ecdh.h openssl/ec.h],
     [],
     [AC_MSG_ERROR([OpenSSL header files not found.]); break]
   )
@@ -45,11 +45,11 @@ AC_DEFUN([tinc_OPENSSL],
     [AC_MSG_ERROR([OpenSSL libraries not found.])]
   )
 
-  AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
+  AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex ECDH_compute_key ECDSA_verify], ,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
   )
 
-  AC_CHECK_DECL([OpenSSL_add_all_algorithms], ,
+  AC_CHECK_DECLS([OpenSSL_add_all_algorithms, EVP_CTRL_GCM_GET_TAG], ,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
     [#include <openssl/evp.h>]
   )