From c57f0b368c10dd5d1962bd40039664f192fffaa5 Mon Sep 17 00:00:00 2001
From: cenhuilin <cenhuilin@kylinos.cn>
Date: Fri, 12 Aug 2022 16:10:23 +0800
Subject: [PATCH] fix CVE-2022-34903

---
 backport-CVE-2022-34903.patch | 48 +++++++++++++++++++++++++++++++++++
 gnupg2.spec                   |  6 ++++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 backport-CVE-2022-34903.patch

diff --git a/backport-CVE-2022-34903.patch b/backport-CVE-2022-34903.patch
new file mode 100644
index 0000000..2bc6e0c
--- /dev/null
+++ b/backport-CVE-2022-34903.patch
@@ -0,0 +1,48 @@
+From 1ec7df5717fa5266b06136918599d3eb5e545107 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 14 Jun 2022 17:34:17 +0800
+Subject: [PATCH] g10: Fix garbled status messages in NOTATION_DATA
+* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+
+Depending on the escaping and line wrapping the computed remaining
+buffer length could be wrong.  Fixed by always using a break to
+terminate the escape detection loop.  Might have happened for all
+status lines which may wrap.
+
+GnuPG-bug-id: T6027
+---
+ g10/cpr.c | 13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/g10/cpr.c b/g10/cpr.c
+index 002656b..f0fc224 100644
+--- a/g10/cpr.c
++++ b/g10/cpr.c
+@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
+             }
+           first = 0;
+         }
+-      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
++      for (esc=0, s=buffer, n=len; n; s++, n--)
+         {
+           if (*s == '%' || *(const byte*)s <= lower_limit
+               || *(const byte*)s == 127 )
+             esc = 1;
+           if (wrap && ++count > wrap)
+-            {
+-              dowrap=1;
+-              break;
+-            }
+-        }
+-      if (esc)
+-        {
+-          s--; n++;
++             dowrap=1;
++          if (esc || dowrap)
++             break;
+         }
+       if (s != buffer)
+         es_fwrite (buffer, s-buffer, 1, statusfp);
+-- 
+2.33.0
+
diff --git a/gnupg2.spec b/gnupg2.spec
index cf848d9..859453a 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,6 +1,6 @@
 Name: gnupg2
 Version: 2.3.6
-Release: 2
+Release: 3
 Summary: Utility for secure communication and data storage
 
 License: GPLv3+
@@ -17,6 +17,7 @@ Patch5:  gnupg-2.2.18-gpg-allow-import-of-previously-known-keys-even-without-UI.
 Patch6:  gnupg-2.2.18-tests-add-test-cases-for-import-without-uid.patch
 Patch7:  gnupg-2.2.20-file-is-digest.patch
 Patch8:  gnupg-2.2.21-coverity.patch
+Patch9:  backport-CVE-2022-34903.patch
 
 BuildRequires: gcc
 BuildRequires: zlib-devel, npth-devel, texinfo
@@ -119,6 +120,9 @@ make check
 
 
 %changelog
+* Fri Aug 12 2022 cenhuilin <cenhuilin@kylinos.cn> - 2.3.6-3
+- fix CVE-2022-34903
+
 * Wed Jul 6 2022 yixiangzhike <yixiangzhike007@163.com> - 2.3.6-2
 - cleanup unused patch files
 
-- 
Gitee