[openssh-commits] [openssh] 06/06: upstream: don't use deprecated ERR_load_crypto_strings()

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit d9df26d7e93f76bc5b1c0cbd31cde0af00ccbbc0
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Jun 29 07:46:22 2026 +0000

    upstream: don't use deprecated ERR_load_crypto_strings()
    
    GHPR650 from Mike Frysinger
    
    OpenBSD-Regress-ID: bfe86d9be1db4569c091f3d763cba04ddbb86ec0
---
 configure.ac                                                 | 4 ++--
 regress/misc/ssh-verify-attestation/ssh-verify-attestation.c | 4 ++--
 regress/unittests/sshkey/tests.c                             | 2 +-
 regress/unittests/sshsig/tests.c                             | 5 +++--
 regress/unittests/test_helper/test_helper.c                  | 2 +-
 ssherr-libcrypto.c                                           | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5eed06b18..a4d544cc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3189,7 +3189,7 @@ if test "x$openssl" = "xyes" ; then
 	AC_MSG_CHECKING([if programs using OpenSSL functions will link])
 	AC_LINK_IFELSE(
 		[AC_LANG_PROGRAM([[ #include <openssl/err.h> ]],
-		[[ ERR_load_crypto_strings(); ]])],
+		[[ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); ]])],
 		[
 			AC_MSG_RESULT([yes])
 		],
@@ -3199,7 +3199,7 @@ if test "x$openssl" = "xyes" ; then
 			AC_MSG_CHECKING([if programs using OpenSSL need -ldl])
 			AC_LINK_IFELSE(
 				[AC_LANG_PROGRAM([[ #include <openssl/err.h> ]],
-				[[ ERR_load_crypto_strings(); ]])],
+				[[ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); ]])],
 				[
 					AC_MSG_RESULT([yes])
 					CHANNELLIBS="$CHANNELLIBS -ldl"
diff --git a/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c b/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
index da7f5a233..dc3cf6ee3 100644
--- a/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
+++ b/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-verify-attestation.c,v 1.3 2025/05/12 05:42:02 tb Exp $ */
+/* $OpenBSD: ssh-verify-attestation.c,v 1.4 2026/06/29 07:46:22 djm Exp $ */
 /*
  * Copyright (c) 2022-2024 Damien Miller
  *
@@ -339,7 +339,7 @@ main(int argc, char **argv)
 	extern int optind;
 	/* extern char *optarg; */
 
-	ERR_load_crypto_strings();
+	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 
 	sanitise_stdfd();
 	log_init(__progname, log_level, SYSLOG_FACILITY_AUTH, 1);
diff --git a/regress/unittests/sshkey/tests.c b/regress/unittests/sshkey/tests.c
index 426543bd7..a797d6692 100644
--- a/regress/unittests/sshkey/tests.c
+++ b/regress/unittests/sshkey/tests.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: tests.c,v 1.2 2025/04/15 04:00:42 djm Exp $ */
+/* 	$OpenBSD: tests.c,v 1.3 2026/06/29 07:46:22 djm Exp $ */
 /*
  * Regress test for sshbuf.h buffer API
  *
diff --git a/regress/unittests/sshsig/tests.c b/regress/unittests/sshsig/tests.c
index 5408be67e..68e893147 100644
--- a/regress/unittests/sshsig/tests.c
+++ b/regress/unittests/sshsig/tests.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: tests.c,v 1.7 2026/06/14 04:08:06 djm Exp $ */
+/* 	$OpenBSD: tests.c,v 1.8 2026/06/29 07:46:22 djm Exp $ */
 /*
  * Regress test for sshbuf.h buffer API
  *
@@ -17,6 +17,7 @@
 #include <unistd.h>
 
 #ifdef WITH_OPENSSL
+#include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
 #endif
@@ -85,7 +86,7 @@ tests(void)
 
 #ifdef WITH_OPENSSL
 	OpenSSL_add_all_algorithms();
-	ERR_load_crypto_strings();
+	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 #endif
 
 	TEST_START("load data");
diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c
index 450b04595..a2cb02d83 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -151,7 +151,7 @@ main(int argc, char **argv)
 
 	seed_rng();
 #ifdef WITH_OPENSSL
-	ERR_load_crypto_strings();
+	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 #endif
 
 	/* Handle systems without __progname */
diff --git a/ssherr-libcrypto.c b/ssherr-libcrypto.c
index 5b817e54a..c825e1a66 100644
--- a/ssherr-libcrypto.c
+++ b/ssherr-libcrypto.c
@@ -36,7 +36,7 @@ ssherr_libcrypto(void)
 	const char *reason = NULL, *file, *data;
 	int ln, fl;
 
-	ERR_load_crypto_strings();
+	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 	while ((e = ERR_get_error_line_data(&file, &ln, &data, &fl)) != 0) {
 		ERR_error_string_n(e, buf, sizeof(buf));
 		snprintf(msg, sizeof(msg), "%s:%s:%d:%s", buf, file, ln,

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.