File openssh-7.2p2-disable_openssl_abi_check.patch of Package openssh-testuser.26950

Overview Repositories Revisions Requests Users Attributes Meta

File openssh-7.2p2-disable_openssl_abi_check.patch of Package openssh-testuser.26950

From e0c15b96e0d4a844930d5b2f4106bb597c9059c9 Mon Sep 17 00:00:00 2001
From: Old openssh patches <pcerny@suse.com>
Date: Wed, 26 Oct 2022 09:52:15 +0200
Subject: [PATCH] openssh-7.2p2-disable_openssl_abi_check

# HG changeset patch
# Parent  96649a415613d6a82d1bb7a750a0abb2b687e0cd
disable run-time check for OpenSSL ABI by version number as that is not a
reliable indicator of ABI changes and doesn't make much sense in a
distribution package
---
 configure.ac | 13 +++++++++++++
 entropy.c    |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/configure.ac b/configure.ac
index b41acd15..817b1e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4668,6 +4668,19 @@ AC_ARG_WITH([bsd-auth],
 	]
 )
 
+# Whether we are using distribution (Open)SSL, so no runtime checks are necessary
+DISTRO_SSL=no
+AC_ARG_WITH([distro-ssl],
+	[  --with-distro-ssl       Disable runtime OpenSSL version checks (good for distributions)],
+	[
+		if test "x$withval" != "xno" ; then
+			AC_DEFINE([DISTRO_SSL], [1],
+                      [Define if you are using distribution SSL library and don;t expect its API/ABI to change])
+			DISTRO_SSL=yes
+		fi
+	]
+)
+
 # Where to place sshd.pid
 piddir=/var/run
 # make sure the directory exists
diff --git a/entropy.c b/entropy.c
index a373325c..9787a189 100644
--- a/entropy.c
+++ b/entropy.c
@@ -214,9 +214,11 @@ seed_rng(void)
 #ifndef OPENSSL_PRNG_ONLY
 	unsigned char buf[RANDOM_SEED_SIZE];
 #endif
+#ifndef DISTRO_SSL
 	if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER, SSLeay()))
 		fatal("OpenSSL version mismatch. Built against %lx, you "
 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
+#endif
 
 #ifndef OPENSSL_PRNG_ONLY
 	if (RAND_status() == 1) {
-- 
2.38.0

Places

File openssh-7.2p2-disable_openssl_abi_check.patch of Package openssh-testuser.26950

Places