[PATCH] tools: mkimage: fix build with recent LibreSSL
Recent versions of LibreSSL, such as those shipped as part of OpenBSD 7.1 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 --- 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..eb5626411c 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 < 0x3050100fL #define RSA_get0_n(key) (key)->n #define RSA_get0_e(key) (key)->e #define RSA_get0_d(key) (key)->d
On Sat, Aug 27, 2022 at 07:23:44PM +0200, Mark Kettenis wrote:
Recent versions of LibreSSL, such as those shipped as part of OpenBSD 7.1 and later have an opaque RSA object and do provide the RSA_get0_* functions that OpenSSL provides.
part of 3.5.0 / 0x3050000fL as well https://lists.denx.de/pipermail/u-boot/2022-July/489768.html https://marc.info/?l=libressl&m=164572407401570&w=2
Fixes: 2ecc354b8e46 ("tools: mkimage: fix build with LibreSSL") Signed-off-by: Mark Kettenis kettenis@openbsd.org
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..eb5626411c 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 < 0x3050100fL #define RSA_get0_n(key) (key)->n #define RSA_get0_e(key) (key)->e
#define RSA_get0_d(key) (key)->d
2.37.2
Date: Mon, 29 Aug 2022 00:37:55 +1000 From: Jonathan Gray jsg@jsg.id.au
On Sat, Aug 27, 2022 at 07:23:44PM +0200, Mark Kettenis wrote:
Recent versions of LibreSSL, such as those shipped as part of OpenBSD 7.1 and later have an opaque RSA object and do provide the RSA_get0_* functions that OpenSSL provides.
part of 3.5.0 / 0x3050000fL as well https://lists.denx.de/pipermail/u-boot/2022-July/489768.html https://marc.info/?l=libressl&m=164572407401570&w=2
Hmm, I thought I'd checked the 3.5.0 tarball, but apparently I didn't. Just posted v2 with the version check adjusted.
Fixes: 2ecc354b8e46 ("tools: mkimage: fix build with LibreSSL") Signed-off-by: Mark Kettenis kettenis@openbsd.org
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..eb5626411c 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 < 0x3050100fL #define RSA_get0_n(key) (key)->n #define RSA_get0_e(key) (key)->e
#define RSA_get0_d(key) (key)->d
2.37.2
participants (3)
-
Jonathan Gray -
Mark Kettenis -
Mark Kettenis