From 48e40fac2b68e4b9e59a093cffb3d4324b435ac7 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Wed, 26 Feb 2020 22:29:38 +0100
Subject: [PATCH] OpenVPN changes

Include <wolfssl/options.h> in settings.h for OpenVPN
Additional API fixes
---
 configure.ac                 | 2 +-
 wolfssl/openssl/err.h        | 2 +-
 wolfssl/openssl/rsa.h        | 1 +
 wolfssl/wolfcrypt/settings.h | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index f56cfd6b3..0a482ef03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3531,7 +3531,7 @@ fi
 
 if test "$ENABLED_OPENVPN" = "yes"
 then
-    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB -DHAVE_EX_DATA"
+    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB -DHAVE_EX_DATA -DWOLFSSL_KEY_GEN"
 fi
 
 
diff --git a/wolfssl/openssl/err.h b/wolfssl/openssl/err.h
index ae50458d5..cb1acc094 100644
--- a/wolfssl/openssl/err.h
+++ b/wolfssl/openssl/err.h
@@ -22,7 +22,7 @@
 #ifndef WOLFSSL_OPENSSL_ERR_
 #define WOLFSSL_OPENSSL_ERR_
 
-#include <wolfssl/openssl/ssl.h>
+#include <wolfssl/wolfcrypt/logging.h>
 
 /* err.h for openssl */
 #define ERR_load_crypto_strings          wolfSSL_ERR_load_crypto_strings
diff --git a/wolfssl/openssl/rsa.h b/wolfssl/openssl/rsa.h
index 658dc7b46..6db3173b2 100644
--- a/wolfssl/openssl/rsa.h
+++ b/wolfssl/openssl/rsa.h
@@ -26,6 +26,7 @@
 #define WOLFSSL_RSA_H_
 
 #include <wolfssl/openssl/bn.h>
+#include <wolfssl/openssl/err.h>
 #include <wolfssl/wolfcrypt/types.h>
 
 #ifdef __cplusplus
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 060d8a185..d84d5b3f7 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -31,6 +31,11 @@
     extern "C" {
 #endif
 
+/* include the options.h file ourselves for OpenVPN */
+#ifdef ENABLE_CRYPTO_WOLFSSL
+#include <wolfssl/options.h>
+#endif
+
 /* Uncomment next line if using IPHONE */
 /* #define IPHONE */