cb8508c41b
Small bugfix release For details refer to https://github.com/OpenVPN/openvpn/blob/v2.6.6/Changes.rst Also, set depends on DCO kernel module when ENABLE_DCO flag is set. Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
20 lines
864 B
Diff
20 lines
864 B
Diff
--- a/src/openvpn/crypto_openssl.c
|
|
+++ b/src/openvpn/crypto_openssl.c
|
|
@@ -51,7 +51,7 @@
|
|
#include <openssl/rand.h>
|
|
#include <openssl/ssl.h>
|
|
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(ENABLE_CRYPTO_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
#include <openssl/kdf.h>
|
|
#endif
|
|
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
|
|
@@ -1436,7 +1436,7 @@ engine_load_key(const char *file, SSL_CT
|
|
#endif /* if HAVE_OPENSSL_ENGINE */
|
|
}
|
|
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(ENABLE_CRYPTO_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
bool
|
|
ssl_tls1_PRF(const uint8_t *seed, int seed_len, const uint8_t *secret,
|
|
int secret_len, uint8_t *output, int output_len)
|