All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl
@ 2021-08-04 20:23 Fabrice Fontaine
  2021-08-04 20:33 ` Yann E. MORIN
  0 siblings, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2021-08-04 20:23 UTC (permalink / raw)
  To: buildroot; +Cc: Jianhui Zhao, Fabrice Fontaine

Fix the following build failure with wolfssl raised since bump to
version 3.12.1 in commit 4d85defa7103aadc74223868fb83ed0bed144f4d:

/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function)
  174 |     SSL_CTX_set_ciphersuites(c, tls13_ciphersuites);
      |                                 ^~~~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/25db1e999950bbee069ba7364a228184a6a77808

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...001-openssl.c-fix-build-with-wolfssl.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch

diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch
new file mode 100644
index 0000000000..deb1a0f93b
--- /dev/null
+++ b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch
@@ -0,0 +1,47 @@
+From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 4 Aug 2021 11:32:39 +0200
+Subject: [PATCH] openssl.c: fix build with wolfssl
+
+Fix the following build failure with wolfssl:
+
+/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
+/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function)
+  174 |     SSL_CTX_set_ciphersuites(c, tls13_ciphersuites);
+      |                                 ^~~~~~~~~~~~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/zhaojh329/ssl/pull/1]
+---
+ openssl.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openssl.c b/openssl.c
+index 8f3d8b7..c42638c 100644
+--- a/src/ssl/openssl.c
++++ b/src/ssl/openssl.c
+@@ -71,14 +71,14 @@
+                 "TLS13-AES256-GCM-SHA384:"		\
+                 ecdhe_aead_ciphers
+ #else
+-# define tls13_ciphersuites	"TLS_CHACHA20_POLY1305_SHA256:"		\
+-                "TLS_AES_128_GCM_SHA256:"		\
+-                "TLS_AES_256_GCM_SHA384"
+-
+ # define top_ciphers							\
+                 ecdhe_aead_ciphers
+ #endif
+ 
++# define tls13_ciphersuites	"TLS_CHACHA20_POLY1305_SHA256:"		\
++                "TLS_AES_128_GCM_SHA256:"		\
++                "TLS_AES_256_GCM_SHA384"
++
+ #define ecdhe_aead_ciphers						\
+                 "ECDHE-ECDSA-CHACHA20-POLY1305:"	\
+                 "ECDHE-ECDSA-AES128-GCM-SHA256:"	\
+-- 
+2.30.2
+
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl
  2021-08-04 20:23 [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl Fabrice Fontaine
@ 2021-08-04 20:33 ` Yann E. MORIN
  0 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2021-08-04 20:33 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Jianhui Zhao, buildroot

Fabrice, All,

On 2021-08-04 22:23 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure with wolfssl raised since bump to
> version 3.12.1 in commit 4d85defa7103aadc74223868fb83ed0bed144f4d:
> 
> /tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
> /tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function)
>   174 |     SSL_CTX_set_ciphersuites(c, tls13_ciphersuites);
>       |                                 ^~~~~~~~~~~~~~~~~~
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/25db1e999950bbee069ba7364a228184a6a77808
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...001-openssl.c-fix-build-with-wolfssl.patch | 47 +++++++++++++++++++
>  1 file changed, 47 insertions(+)
>  create mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch
> 
> diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch
> new file mode 100644
> index 0000000000..deb1a0f93b
> --- /dev/null
> +++ b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch
> @@ -0,0 +1,47 @@
> +From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Wed, 4 Aug 2021 11:32:39 +0200
> +Subject: [PATCH] openssl.c: fix build with wolfssl
> +
> +Fix the following build failure with wolfssl:
> +
> +/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
> +/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function)
> +  174 |     SSL_CTX_set_ciphersuites(c, tls13_ciphersuites);
> +      |                                 ^~~~~~~~~~~~~~~~~~
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/zhaojh329/ssl/pull/1]

I was wondering why this was a PR on the 'ssl' repository, when you aply
it to the libuhttpd package. But it turns out that both are maintained
by the same person, and 'ssl' is a git submodule for libuhttpd.

I've added a note in the commit log about that, and applied to master,
thanks.

Regards,
Yann E. MORIN.

> +---
> + openssl.c | 8 ++++----
> + 1 file changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/openssl.c b/openssl.c
> +index 8f3d8b7..c42638c 100644
> +--- a/src/ssl/openssl.c
> ++++ b/src/ssl/openssl.c
> +@@ -71,14 +71,14 @@
> +                 "TLS13-AES256-GCM-SHA384:"		\
> +                 ecdhe_aead_ciphers
> + #else
> +-# define tls13_ciphersuites	"TLS_CHACHA20_POLY1305_SHA256:"		\
> +-                "TLS_AES_128_GCM_SHA256:"		\
> +-                "TLS_AES_256_GCM_SHA384"
> +-
> + # define top_ciphers							\
> +                 ecdhe_aead_ciphers
> + #endif
> + 
> ++# define tls13_ciphersuites	"TLS_CHACHA20_POLY1305_SHA256:"		\
> ++                "TLS_AES_128_GCM_SHA256:"		\
> ++                "TLS_AES_256_GCM_SHA384"
> ++
> + #define ecdhe_aead_ciphers						\
> +                 "ECDHE-ECDSA-CHACHA20-POLY1305:"	\
> +                 "ECDHE-ECDSA-AES128-GCM-SHA256:"	\
> +-- 
> +2.30.2
> +
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl
  2021-07-10  9:06 Fabrice Fontaine
@ 2021-07-16 21:22 ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-07-16 21:22 UTC (permalink / raw)
  To: buildroot

On Sat, 10 Jul 2021 11:06:33 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Build with wolfssl is broken since bump to version 3.12.1 in commit
> 4d85defa7103aadc74223868fb83ed0bed144f4d:
> 
> /data/buildroot-autobuilder/instance-0/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
> /data/buildroot-autobuilder/instance-0/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:180:32: error: 'SSL_OP_NO_SSLv3' undeclared (first use in this function); did you mean 'WOLFSSL_OP_NO_SSLv3'?
>   180 |         SSL_CTX_set_options(c, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1);
>       |                                ^~~~~~~~~~~~~~~
>       |                                WOLFSSL_OP_NO_SSLv3
> 
> This build failure is raised by
> https://github.com/zhaojh329/libuhttpd/commit/0fb46935f0cd5f737c6f4e6053d62268aca793a7
> as since this commit, libuhttpd expects that SSL_OP_NO_xxx are defined
> by wolfssl
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/79e3fa697537f2e33863e490b74ec881993eae73
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libuhttpd/Config.in | 1 +
>  1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl
@ 2021-07-10  9:06 Fabrice Fontaine
  2021-07-16 21:22 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2021-07-10  9:06 UTC (permalink / raw)
  To: buildroot

Build with wolfssl is broken since bump to version 3.12.1 in commit
4d85defa7103aadc74223868fb83ed0bed144f4d:

/data/buildroot-autobuilder/instance-0/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
/data/buildroot-autobuilder/instance-0/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:180:32: error: 'SSL_OP_NO_SSLv3' undeclared (first use in this function); did you mean 'WOLFSSL_OP_NO_SSLv3'?
  180 |         SSL_CTX_set_options(c, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1);
      |                                ^~~~~~~~~~~~~~~
      |                                WOLFSSL_OP_NO_SSLv3

This build failure is raised by
https://github.com/zhaojh329/libuhttpd/commit/0fb46935f0cd5f737c6f4e6053d62268aca793a7
as since this commit, libuhttpd expects that SSL_OP_NO_xxx are defined
by wolfssl

Fixes:
 - http://autobuild.buildroot.org/results/79e3fa697537f2e33863e490b74ec881993eae73

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libuhttpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in
index 1ab39c5878..9159341d89 100644
--- a/package/libuhttpd/Config.in
+++ b/package/libuhttpd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBUHTTPD
 	bool "libuhttpd"
 	select BR2_PACKAGE_LIBEV
+	select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL
 	help
 	  A lightweight and fully asynchronous HTTP server
 	  library based on libev
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-04 20:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 20:23 [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl Fabrice Fontaine
2021-08-04 20:33 ` Yann E. MORIN
  -- strict thread matches above, loose matches on Subject: below --
2021-07-10  9:06 Fabrice Fontaine
2021-07-16 21:22 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.