jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Relax OpenSSH build-time checks for OpenSSL version

Browse Source 
Related: RHEL-4734
This commit is contained in:
Dmitry Belyavskiy 2023-12-20 11:31:43 +01:00
parent 54fc8050ff
commit d18e1c1119
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openssh-9.3p1-openssl-compat.patch
View File

@ -38,3 +38,15 @@
*/ */
mask = 0xfff0000fL; /* major,minor,status */ mask = 0xfff0000fL; /* major,minor,status */
hfix = (headerver & 0x000ff000) >> 12; hfix = (headerver & 0x000ff000) >> 12;
diff -up openssh-8.7p1/configure.ac.check openssh-8.7p1/configure.ac
--- openssh-8.7p1/configure.ac.check 2023-11-27 14:54:32.959113758 +0100
+++ openssh-8.7p1/configure.ac 2023-11-27 14:54:49.467500523 +0100
@@ -2821,7 +2821,7 @@ if test "x$openssl" = "xyes" ; then
;;
101*) ;; # 1.1.x
200*) ;; # LibreSSL
- 300*) ;; # OpenSSL development branch.
+ 30*) ;; # OpenSSL 3.x series
*)
AC_MSG_ERROR([Unknown/unsupported OpenSSL version ("$ssl_library_ver")])
;;

2
openssh.spec
View File

@ -798,6 +798,8 @@ test -f %{sysconfig_anaconda} && \
* Wed Dec 20 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-36 * Wed Dec 20 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-36
- Fix Terrapin attack - Fix Terrapin attack
Resolves: CVE-2023-48795 Resolves: CVE-2023-48795
- Relax OpenSSH build-time checks for OpenSSL version
Related: RHEL-4734
* Mon Oct 23 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-35 * Mon Oct 23 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-35
- Relax OpenSSH checks for OpenSSL version - Relax OpenSSH checks for OpenSSL version