diff --git a/gnupg-2.3.6-status-line-injection.patch b/gnupg-2.3.6-status-line-injection.patch deleted file mode 100644 index f4ed609..0000000 --- a/gnupg-2.3.6-status-line-injection.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Tue, 14 Jun 2022 11:33:27 +0200 -Subject: [PATCH GnuPG] 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 9bfdd3c34..fa8005d6f 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.35.3 - diff --git a/gnupg2-aead.patch b/gnupg2-aead.patch deleted file mode 100644 index acb60d1..0000000 --- a/gnupg2-aead.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/g10/keygen.c b/g10/keygen.c -index 6106d98ba..945494a8b 100644 ---- a/g10/keygen.c -+++ b/g10/keygen.c -@@ -568,7 +568,7 @@ keygen_set_std_prefs (const char *string,int personal) - for (i=0; i - 2.3.7-1 +- New upstream release (#2106045) + * Mon Jul 04 2022 Jakub Jelen - 2.3.6-2 - Fix for CVE-2022-34903 (#2103242) - Fix focing AEAD through configuration files (#2093760)