projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warn if we cannot reload the tincd when creating an invitation.
[tinc]
/
m4
/
openssl.m4
diff --git
a/m4/openssl.m4
b/m4/openssl.m4
index
254ea4f
..
0ff939b
100644
(file)
--- a/
m4/openssl.m4
+++ b/
m4/openssl.m4
@@
-1,4
+1,4
@@
-dnl Check to find the OpenSSL headers/libraries
+dnl Check to find the
LibreSSL/
OpenSSL headers/libraries
AC_DEFUN([tinc_OPENSSL],
[
AC_DEFUN([tinc_OPENSSL],
[
@@
-10,47
+10,50
@@
AC_DEFUN([tinc_OPENSSL],
[],
[AC_CHECK_LIB(dl, dlopen,
[LIBS="$LIBS -ldl"],
[],
[AC_CHECK_LIB(dl, dlopen,
[LIBS="$LIBS -ldl"],
- [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
+ [AC_MSG_ERROR([
LibreSSL/
OpenSSL depends on libdl.]); break]
)]
)
;;
esac
AC_ARG_WITH(openssl,
)]
)
;;
esac
AC_ARG_WITH(openssl,
- AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
+ AS_HELP_STRING([--with-openssl=DIR], [
LibreSSL/
OpenSSL base directory, or:]),
[openssl="$withval"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"]
)
AC_ARG_WITH(openssl-include,
[openssl="$withval"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"]
)
AC_ARG_WITH(openssl-include,
- AS_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),
+ AS_HELP_STRING([--with-openssl-include=DIR], [
LibreSSL/
OpenSSL headers directory (without trailing /openssl)]),
[openssl_include="$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(openssl-lib,
[openssl_include="$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(openssl-lib,
- AS_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),
+ AS_HELP_STRING([--with-openssl-lib=DIR], [
LibreSSL/
OpenSSL library directory]),
[openssl_lib="$withval"
LDFLAGS="$LDFLAGS -L$withval"]
)
[openssl_lib="$withval"
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]
,
[],
[],
- [AC_MSG_ERROR([OpenSSL header files not found.]); break]
+ [AC_MSG_ERROR([
LibreSSL/
OpenSSL header files not found.]); break]
)
AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
[LIBS="-lcrypto $LIBS"],
)
AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
[LIBS="-lcrypto $LIBS"],
- [AC_MSG_ERROR([OpenSSL libraries not found.])]
+ [AC_MSG_ERROR([
LibreSSL/
OpenSSL libraries not found.])]
)
)
- AC_CHECK_FUNCS([RAND_
pseudo_bytes EVP_EncryptInit_ex
], ,
- [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
+ AC_CHECK_FUNCS([RAND_
bytes EVP_EncryptInit_ex EVP_CIPHER_CTX_new
], ,
+ [AC_MSG_ERROR([Missing
LibreSSL/
OpenSSL functionality, make sure you have installed the latest version.]); break],
)
)
- AC_CHECK_DECL
([OpenSSL_add_all_algorithms
], ,
- [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
+ AC_CHECK_DECL
S([OpenSSL_add_all_algorithms, EVP_aes_256_cfb
], ,
+ [AC_MSG_ERROR([Missing
LibreSSL/
OpenSSL functionality, make sure you have installed the latest version.]); break],
[#include <openssl/evp.h>]
)
[#include <openssl/evp.h>]
)
+
+ AC_CHECK_FUNCS([BN_GENCB_new ERR_remove_state RSA_set0_key], , , [#include <openssl/rsa.h>])
+ AC_CHECK_FUNCS([HMAC_CTX_new], , , [#include <openssl/hmac.h>])
])
])