diff mbox series

[1/1] Let options.h be the first wolfSSL include

Message ID 20240621181509.32850-2-bage@debian.org
State Changes Requested
Headers show
Series Fix wolfSSL build | expand

Commit Message

Bastian Germann June 21, 2024, 6:15 p.m. UTC
cbceee179d (Fix build error when WolfSSL is used) included
wolfssl/ssl.h in front of wolfssl/options.h, which has to be the first
wolfSSL include. The compilation will error on the X509 type with this.

Change the include order.
---
 include/sslapi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefano Babic July 5, 2024, 12:08 p.m. UTC | #1
Hi Bastian,

On 21.06.24 20:15, Bastian Germann wrote:
> cbceee179d (Fix build error when WolfSSL is used) included
> wolfssl/ssl.h in front of wolfssl/options.h, which has to be the first
> wolfSSL include. The compilation will error on the X509 type with this.
>
> Change the include order.
> ---
>   include/sslapi.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/sslapi.h b/include/sslapi.h
> index 64640184..36762b93 100644
> --- a/include/sslapi.h
> +++ b/include/sslapi.h
> @@ -41,8 +41,8 @@
>   #include <openssl/opensslv.h>
>   #include <openssl/cms.h>
>   #elif defined(CONFIG_SSL_IMPL_WOLFSSL)
> -#include <wolfssl/ssl.h>
>   #include <wolfssl/options.h>
> +#include <wolfssl/ssl.h>
>   #include <wolfssl/openssl/bio.h>
>   #include <wolfssl/openssl/objects.h>
>   #include <wolfssl/openssl/err.h>

With this I can build, but your Signed-off-by is missing. Please add it.

Best regards,
Stefano
diff mbox series

Patch

diff --git a/include/sslapi.h b/include/sslapi.h
index 64640184..36762b93 100644
--- a/include/sslapi.h
+++ b/include/sslapi.h
@@ -41,8 +41,8 @@ 
 #include <openssl/opensslv.h>
 #include <openssl/cms.h>
 #elif defined(CONFIG_SSL_IMPL_WOLFSSL)
-#include <wolfssl/ssl.h>
 #include <wolfssl/options.h>
+#include <wolfssl/ssl.h>
 #include <wolfssl/openssl/bio.h>
 #include <wolfssl/openssl/objects.h>
 #include <wolfssl/openssl/err.h>