All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Jianhui Zhao <zhaojh329@gmail.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with wolfssl
Date: Wed, 4 Aug 2021 22:33:21 +0200	[thread overview]
Message-ID: <20210804203321.GL27036@scaer> (raw)
In-Reply-To: <20210804202354.1160141-1-fontaine.fabrice@gmail.com>

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

  reply	other threads:[~2021-08-04 20:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-07-10  9:06 Fabrice Fontaine
2021-07-16 21:22 ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210804203321.GL27036@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=fontaine.fabrice@gmail.com \
    --cc=zhaojh329@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.