Attachment 242520 Details for Bug 271615 – 0001-dumpon-Request-the-OpenSSL-1.1-API.patch

[patch] 0001-dumpon-Request-the-OpenSSL-1.1-API.patch

0001-dumpon-Request-the-OpenSSL-1.1-API.patch (text/plain), 1.50 KB, created by Pierre Pronchery on 2023-05-31 15:35:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Pronchery

Created: 2023-05-31 15:35:56 UTC

Size: 1.50 KB

patch

obsolete

>From 84502b750c35a1555a25607548bd392a2d70e6a5 Mon Sep 17 00:00:00 2001
>From: Pierre Pronchery <pierre@freebsdfoundation.org>
>Date: Wed, 31 May 2023 17:17:54 +0200
>Subject: [PATCH] dumpon: Request the OpenSSL 1.1 API
>
>OPENSSL_API_COMPAT can be used to specify the OpenSSL API version in
>use for the purpose of hiding deprecated interfaces and enabling
>the appropriate deprecation notices.
>
>This change is a NFC while we're still using OpenSSL 1.1.1 but will
>avoid deprecation warnings upon the switch to OpenSSL 3.0.
>
>A future update may migrate to use the OpenSSL 3.0 APIs.
>
>PR:		271615
>Sponsored by:	The FreeBSD Foundation
>---
> sbin/dumpon/Makefile | 1 +
> sbin/dumpon/dumpon.c | 2 ++
> 2 files changed, 3 insertions(+)
>
>diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
>index d0700ab16a89..71afa396ce5c 100644
>--- a/sbin/dumpon/Makefile
>+++ b/sbin/dumpon/Makefile
>@@ -8,6 +8,7 @@ PROG=	dumpon
> .if ${MK_OPENSSL} != "no"
> LIBADD=	crypto
> CFLAGS+=-DHAVE_CRYPTO
>+CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L
> .endif
> 
> MAN=	dumpon.8
>diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
>index c530c9ad59ed..cf6c41bdec23 100644
>--- a/sbin/dumpon/dumpon.c
>+++ b/sbin/dumpon/dumpon.c
>@@ -565,8 +565,10 @@ main(int argc, char *argv[])
> #ifdef HAVE_CRYPTO
> 	if (cipher != KERNELDUMP_ENC_NONE && pubkeyfile == NULL) {
> 		errx(EX_USAGE, "-C option requires a public key file.");
>+# if OPENSSL_API_COMPAT < 0x10100000L
> 	} else if (pubkeyfile != NULL) {
> 		ERR_load_crypto_strings();
>+# endif
> 	}
> #else
> 	if (pubkeyfile != NULL)
>-- 
>2.40.1
>

Actions: View | Diff

Attachments on bug 271615: 242520