!10 fix division zero issue which found by oss-fuzz

Merge pull request !10 from steven/master
This commit is contained in:
openeuler-ci-bot 2020-03-19 10:04:27 +08:00 committed by Gitee
commit d2c10084ce
2 changed files with 37 additions and 1 deletions

View File

@ -2,7 +2,7 @@
Name: openssl
Epoch: 1
Version: 1.1.1d
Release: 8
Release: 9
Summary: Cryptography and SSL/TLS Toolkit
License: OpenSSL and SSLeay
URL: https://www.openssl.org/
@ -11,6 +11,7 @@ Source1: Makefile.certificate
Patch1: openssl-1.1.1-build.patch
Patch2: openssl-1.1.1-fips.patch
Patch3: CVE-2019-1551.patch
Patch4: use-the-correct-maximum-indent.patch
BuildRequires: gcc make lksctp-tools-devel coreutils util-linux zlib-devel
@ -186,6 +187,9 @@ make test || :
%{_pkgdocdir}/html/
%changelog
* Wed Mar 18 2020 steven <steven_ygui@163.com> - 1:1.1.1d-9
- fix division zero issue which found by oss-fuzz
* Tue Mar 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:1.1.1d-8
- add missiong /sbin/ldconfig

View File

@ -0,0 +1,32 @@
From a6105ef40d65b35818f2b8ae8ca9e57ca6956d1d Mon Sep 17 00:00:00 2001
From: Kurt Roeckx <kurt@roeckx.be>
Date: Fri, 20 Sep 2019 20:26:42 +0200
Subject: [PATCH] Use the correct maximum indent
Found by OSS-Fuzz
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
GH: #9959
---
crypto/bio/b_dump.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index e4ad3615f4..018c4acb27 100644
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -37,8 +37,8 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
if (indent < 0)
indent = 0;
- else if (indent > 128)
- indent = 128;
+ else if (indent > 64)
+ indent = 64;
dump_width = DUMP_WIDTH_LESS_INDENT(indent);
rows = len / dump_width;
--
1.8.3.1