!24 [sync] PR-22: 【openEuler-20.03-LTS-SP1】fix CVE-2022-47629

From: @openeuler-sync-bot 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee

backport-CVE-2022-3515-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch

@@ -0,0 +1,42 @@
+From 4b7d9cd4a018898d7714ce06f3faf2626c14582b Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Wed, 5 Oct 2022 14:19:06 +0200
+Subject: [PATCH] Detect a possible overflow directly in the TLV parser.
+
+* src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly
+used sum.
+--
+
+It is quite common to have checks like
+
+    if (ti.nhdr + ti.length >= DIM(tmpbuf))
+       return gpg_error (GPG_ERR_TOO_LARGE);
+
+This patch detects possible integer overflows immmediately when
+creating the TI object.
+
+Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929
+---
+ src/ber-help.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ber-help.c b/src/ber-help.c
+index 81c31ed..56efb6a 100644
+--- a/src/ber-help.c
++++ b/src/ber-help.c
+@@ -182,6 +182,12 @@ _ksba_ber_read_tl (ksba_reader_t reader, struct tag_info *ti)
+       ti->length = len;
+     }
+ 
++  if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length)
++    {
++      ti->err_string = "header+length would overflow";
++      return gpg_error (GPG_ERR_EOVERFLOW);
++    }
++
+   /* Without this kludge some example certs can't be parsed */
+   if (ti->class == CLASS_UNIVERSAL && !ti->tag)
+     ti->length = 0;
+-- 
+2.27.0
+

backport-CVE-2022-47629-Fix-an-integer-overflow-in-the-CRL-signature-parser.patch

@@ -0,0 +1,68 @@
+From f61a5ea4e0f6a80fd4b28ef0174bee77793cf070 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 22 Nov 2022 16:36:46 +0100
+Subject: [PATCH] Fix an integer overflow in the CRL signature parser.
+
+* src/crl.c (parse_signature): N+N2 now checked for overflow.
+
+* src/ocsp.c (parse_response_extensions): Do not accept too large
+values.
+(parse_single_extensions): Ditto.
+--
+
+The second patch is an extra safegourd not related to the reported
+bug.
+
+GnuPG-bug-id: 6284
+Reported-by: Joseph Surin, elttam
+---
+ src/crl.c  |  2 +-
+ src/ocsp.c | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/crl.c b/src/crl.c
+index 9f71c85..2e6ca29 100644
+--- a/src/crl.c
++++ b/src/crl.c
+@@ -1349,7 +1349,7 @@ parse_signature (ksba_crl_t crl)
+          && !ti.is_constructed) )
+     return gpg_error (GPG_ERR_INV_CRL_OBJ);
+   n2 = ti.nhdr + ti.length;
+-  if (n + n2 >= DIM(tmpbuf))
++  if (n + n2 >= DIM(tmpbuf) || (n + n2) < n)
+     return gpg_error (GPG_ERR_TOO_LARGE);
+   memcpy (tmpbuf+n, ti.buf, ti.nhdr);
+   err = read_buffer (crl->reader, tmpbuf+n+ti.nhdr, ti.length);
+diff --git a/src/ocsp.c b/src/ocsp.c
+index d4cba04..657d15f 100644
+--- a/src/ocsp.c
++++ b/src/ocsp.c
+@@ -721,6 +721,12 @@ parse_response_extensions (ksba_ocsp_t ocsp,
+           else
+             ocsp->good_nonce = 1;
+         }
++      if (ti.length > (1<<24))
++        {
++          /* Bail out on much too large objects.  */
++          err = gpg_error (GPG_ERR_BAD_BER);
++          goto leave;
++        }
+       ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length);
+       if (!ex)
+         {
+@@ -788,6 +794,12 @@ parse_single_extensions (struct ocsp_reqitem_s *ri,
+       err = parse_octet_string (&data, &datalen, &ti);
+       if (err)
+         goto leave;
++      if (ti.length > (1<<24))
++        {
++          /* Bail out on much too large objects.  */
++          err = gpg_error (GPG_ERR_BAD_BER);
++          goto leave;
++        }
+       ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length);
+       if (!ex)
+         {
+-- 
+2.27.0
+

libksba-1.3.0-multilib.patch

@@ -1,23 +0,0 @@
-diff -up libksba-1.3.0/src/ksba-config.in.multilib libksba-1.3.0/src/ksba-config.in
---- libksba-1.3.0/src/ksba-config.in.multilib	2011-02-25 09:33:11.000000000 +0100
-+++ libksba-1.3.0/src/ksba-config.in	2012-12-03 16:17:52.050832689 +0100
-@@ -15,7 +15,7 @@ cflags="@KSBA_CONFIG_CFLAGS@ @GPG_ERROR_
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- api_version="@KSBA_CONFIG_API_VERSION@"
--my_host="@KSBA_CONFIG_HOST@"
-+my_host="none"
- 
- includes=""
- libdirs=""
-@@ -125,10 +125,6 @@ if test "$echo_cflags" = "yes"; then
- fi
- 
- if test "$echo_libs" = "yes"; then
--    libdirs=""
--    if test "@libdir@" != "/usr/lib" ; then
--      libdirs="-L@libdir@"
--    fi
-     tmp=""
-     for i in $libdirs $libs; do
-        if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then

libksba.spec

@@ -1,13 +1,14 @@
 Name:     libksba
-Version:  1.3.5
-Release:  11
+Version:  1.4.0
+Release:  4
 Summary:  A library for X.509 and CMS
 License:  (LGPL-3.0+ or GPL-2.0+) and GPL-3.0+ and MIT
 URL:      https://www.gnupg.org/software/libksba/index.html
 Source0:  ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2
 Source1:  ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
 
-Patch1:   libksba-1.3.0-multilib.patch
+Patch1:   backport-CVE-2022-3515-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
+Patch2:   backport-CVE-2022-47629-Fix-an-integer-overflow-in-the-CRL-signature-parser.patch
 
 BuildRequires: gcc gawk libgpg-error-devel >= 1.8 libgcrypt-devel >= 1.2.0
 
@@ -19,8 +20,6 @@ the implemented protocols and presents the data in a consistent way.
 %package devel
 Summary: Development headers and libraries for %{name}
 Requires:%{name} = %{version}-%{release}
-Requires(post): info
-Requires(preun):info
 
 %description devel
 Development headers and libraries for %{name}
@@ -57,26 +56,46 @@ make check
 %{_libdir}/libksba.so.*
 %exclude %{_infodir}/dir
 
-%post devel
-install-info %{_infodir}/ksba.info %{_infodir}/dir ||:
-
-%preun devel
-if [ $1 -eq 0 ]; then
-  install-info --delete %{_infodir}/ksba.info %{_infodir}/dir ||:
-fi
-
 %files devel
 %defattr(-,root,root)
 %{_bindir}/*
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_datadir}/aclocal/ksba.m4
+%{_libdir}/pkgconfig/ksba.pc
 
 %files help
 %doc TODO 
 %{_datadir}/info/ksba.info.gz
 
 %changelog
+* Thu Dec 22 2022 yixiangzhike <yixiangzhike007@163.com> - 1.4.0-4
+- Type:cve
+- ID:CVE-2022-47629
+- SUG:NA
+- DESC:fix CVE-2022-47629
+
+* Wed Oct 19 2022 yixiangzhike <yixiangzhike007@163.com> - 1.4.0-3
+- Type:cve
+- ID:CVE-2022-3515
+- SUG:NA
+- DESC:fix CVE-2022-3515
+
+* Fri Sep 25 2020 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 1.4.0-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Remove obsolete scriptlets
+
+* Mon Aug 24 2020 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 1.4.0-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update version to 1.4.0
+
+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.5-12
+- delete unused patch
+
 * Wed Oct 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.3.5-11
 - Type:enhancement
 - ID:NA