From 79d4d7133f07b399155a4d2eb20a8ee1ca705569 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Wed, 31 May 2023 12:25:58 -0400 Subject: [PATCH] dumpon: update OpenSSL initialization call ERR_load_crypto_strings() was deprecated in OpenSSL 1.1.0, and explicit initialization is generally not reqiured. In the case of dumpon however we initialize prior to entering capability mode, so replace with an OPENSSL_init_crypto call. Reviewed by: def, Pierre Pronchery Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40353 --- sbin/dumpon/dumpon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index c530c9ad59ed..5bcfe2b8f1e7 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -566,7 +566,12 @@ main(int argc, char *argv[]) if (cipher != KERNELDUMP_ENC_NONE && pubkeyfile == NULL) { errx(EX_USAGE, "-C option requires a public key file."); } else if (pubkeyfile != NULL) { +#if OPENSSL_VERSION_NUMBER < 0x10100000L ERR_load_crypto_strings(); +#else + if (!OPENSSL_init_crypto(0, NULL)) + errx(EX_UNAVAILABLE, "Unable to initialize OpenSSL"); +#endif } #else if (pubkeyfile != NULL)