From 5d9e98be093ab981e6670d26d34e3e6b5b8c1cbd Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
Date: Thu, 20 Mar 2025 13:42:58 +0100
Subject: [PATCH] Correct processing of Compression directive

Resolves: RHEL-68346
---
 openssh-9.9p1-compression-directive.patch | 13 +++++++++++++
 openssh.spec                              |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 openssh-9.9p1-compression-directive.patch

diff --git a/openssh-9.9p1-compression-directive.patch b/openssh-9.9p1-compression-directive.patch
new file mode 100644
index 0000000..96d44e1
--- /dev/null
+++ b/openssh-9.9p1-compression-directive.patch
@@ -0,0 +1,13 @@
+diff --git a/readconf.c b/readconf.c
+index 9f559269..777739d6 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -3410,6 +3410,8 @@ fmt_intarg(OpCodes code, int val)
+ 	switch (code) {
+ 	case oAddressFamily:
+ 		return fmt_multistate_int(val, multistate_addressfamily);
++	case oCompression:
++		return fmt_multistate_int(val, multistate_compression);
+ 	case oVerifyHostKeyDNS:
+ 	case oUpdateHostkeys:
+ 		return fmt_multistate_int(val, multistate_yesnoask);
diff --git a/openssh.spec b/openssh.spec
index 7a6239e..fc2f849 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -206,6 +206,8 @@ Patch1020: openssh-9.9p1-match-regression.patch
 Patch1021: openssh-9.9p2-error_processing.patch
 # Downstream patch, OpenSSL based MLKEM implementation
 Patch1022: openssh-9.9p1-openssl-mlkem.patch
+# upstream 8eabd2ae2ca1d7756417a1ee5b41f09c5d997634
+Patch1023: openssh-9.9p1-compression-directive.patch
 
 License: BSD-3-Clause AND BSD-2-Clause AND ISC AND SSH-OpenSSH AND ssh-keyscan AND sprintf AND LicenseRef-Fedora-Public-Domain AND X11-distribute-modifications-variant
 Requires: /sbin/nologin
@@ -395,6 +397,7 @@ gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
 %patch -P 1020 -p1 -b .match
 %patch -P 1021 -p1 -b .errcode_set
 %patch -P 1022 -p1 -b .openssl-mlkem
+%patch -P 1023 -p1 -b .compression
 
 %patch -P 100 -p1 -b .coverity
 
@@ -678,6 +681,8 @@ test -f %{sysconfig_anaconda} && \
 * Thu Mar 20 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-8
 - OpenSSH should not use its own implementation of MLKEM
   Resolves: RHEL-58252
+- Correct processing of Compression directive
+  Resolves: RHEL-68346
 
 * Tue Feb 18 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-7
 - rebuilt