[PATCH v2] tools: mkimage: fix build with recent LibreSSL

[PATCH v2] tools: mkimage: fix build with recent LibreSSL

[Mark Kettenis]

LibreSSL 3.5.0 and later (also shipped as part of OpenBSD 7.1 and
and later) have an opaque RSA object and do provide the
RSA_get0_* functions that OpenSSL provides.

Fixes: 2ecc354b8e46 ("tools: mkimage: fix build with LibreSSL")
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---

ChangeLog:

v2: - Tweak version check and commit message to reflect that
      LibreSSL 3.5.0 and later have the RSA_get0_* functions


 tools/sunxi_toc0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/sunxi_toc0.c b/tools/sunxi_toc0.c
index 56200bd927..7a8d74bb8e 100644
--- a/tools/sunxi_toc0.c
+++ b/tools/sunxi_toc0.c
@@ -34,7 +34,7 @@
 #define pr_warn(fmt, args...)	fprintf(stderr, pr_fmt(fmt), "warning", ##args)
 #define pr_info(fmt, args...)	fprintf(stderr, pr_fmt(fmt), "info", ##args)
 
-#if defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL
 #define RSA_get0_n(key) (key)->n
 #define RSA_get0_e(key) (key)->e
 #define RSA_get0_d(key) (key)->d
-- 
2.37.2

Re: [PATCH v2] tools: mkimage: fix build with recent LibreSSL

[Jonathan Gray]

On Mon, Aug 29, 2022 at 01:34:01PM +0200, Mark Kettenis wrote:
> LibreSSL 3.5.0 and later (also shipped as part of OpenBSD 7.1 and
> and later) have an opaque RSA object and do provide the
> RSA_get0_* functions that OpenSSL provides.
> 
> Fixes: 2ecc354b8e46 ("tools: mkimage: fix build with LibreSSL")
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>

Reviewed-by: Jonathan Gray <jsg@jsg.id.au>

> ---
> 
> ChangeLog:
> 
> v2: - Tweak version check and commit message to reflect that
>       LibreSSL 3.5.0 and later have the RSA_get0_* functions
> 
> 
>  tools/sunxi_toc0.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/sunxi_toc0.c b/tools/sunxi_toc0.c
> index 56200bd927..7a8d74bb8e 100644
> --- a/tools/sunxi_toc0.c
> +++ b/tools/sunxi_toc0.c
> @@ -34,7 +34,7 @@
>  #define pr_warn(fmt, args...)	fprintf(stderr, pr_fmt(fmt), "warning", ##args)
>  #define pr_info(fmt, args...)	fprintf(stderr, pr_fmt(fmt), "info", ##args)
>  
> -#if defined(LIBRESSL_VERSION_NUMBER)
> +#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL
>  #define RSA_get0_n(key) (key)->n
>  #define RSA_get0_e(key) (key)->e
>  #define RSA_get0_d(key) (key)->d
> -- 
> 2.37.2
> 
> 

Re: [PATCH v2] tools: mkimage: fix build with recent LibreSSL

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

On Mon, Aug 29, 2022 at 01:34:01PM +0200, Mark Kettenis wrote:

> LibreSSL 3.5.0 and later (also shipped as part of OpenBSD 7.1 and
> and later) have an opaque RSA object and do provide the
> RSA_get0_* functions that OpenSSL provides.
> 
> Fixes: 2ecc354b8e46 ("tools: mkimage: fix build with LibreSSL")
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
> Reviewed-by: Jonathan Gray <jsg@jsg.id.au>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]