!19 【Mainline】update to 1.6.2
From: @yixiangzhike Reviewed-by: @HuaxinLuGitee Signed-off-by: @HuaxinLuGitee
This commit is contained in:
commit
e5ac682c56
@ -1,42 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
BIN
libksba-1.6.2.tar.bz2
Normal file
BIN
libksba-1.6.2.tar.bz2
Normal file
Binary file not shown.
BIN
libksba-1.6.2.tar.bz2.sig
Normal file
BIN
libksba-1.6.2.tar.bz2.sig
Normal file
Binary file not shown.
12
libksba.spec
12
libksba.spec
@ -1,14 +1,12 @@
|
|||||||
Name: libksba
|
Name: libksba
|
||||||
Version: 1.6.0
|
Version: 1.6.2
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: A library for X.509 and CMS
|
Summary: A library for X.509 and CMS
|
||||||
License: (LGPL-3.0+ or GPL-2.0+) and GPL-3.0+ and MIT
|
License: (LGPL-3.0+ or GPL-2.0+) and GPL-3.0+ and MIT
|
||||||
URL: https://www.gnupg.org/software/libksba/index.html
|
URL: https://www.gnupg.org/software/libksba/index.html
|
||||||
Source0: https://www.gnupg.org/ftp/gcrypt/libksba/libksba-%{version}.tar.bz2
|
Source0: https://www.gnupg.org/ftp/gcrypt/libksba/libksba-%{version}.tar.bz2
|
||||||
Source1: https://www.gnupg.org/ftp/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
|
Source1: https://www.gnupg.org/ftp/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
|
||||||
|
|
||||||
Patch1: backport-CVE-2022-3515-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc gawk libgpg-error-devel >= 1.8 libgcrypt-devel >= 1.2.0
|
BuildRequires: gcc gawk libgpg-error-devel >= 1.8 libgcrypt-devel >= 1.2.0
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -67,6 +65,12 @@ make check
|
|||||||
%{_datadir}/info/ksba.info.gz
|
%{_datadir}/info/ksba.info.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 15 2022 yixiangzhike <yixiangzhike007@163.com> - 1.6.2-1
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update version to 1.6.2
|
||||||
|
|
||||||
* Wed Oct 19 2022 yixiangzhike <yixiangzhike007@163.com> - 1.6.0-2
|
* Wed Oct 19 2022 yixiangzhike <yixiangzhike007@163.com> - 1.6.0-2
|
||||||
- Type:cve
|
- Type:cve
|
||||||
- ID:CVE-2022-3515
|
- ID:CVE-2022-3515
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user