From 024100e01bfde73e77ebfce657ff69c0c2c7aa7a Mon Sep 17 00:00:00 2001 From: ExtinctFire Date: Mon, 12 Jun 2023 11:40:51 +0800 Subject: [PATCH] fix CVE-2023-2650 (cherry picked from commit b3ef21b5771b585ab927a2ac9e82243a0cb35436) --- ...e-of-OBJECT-IDENTIFIERs-that-OBJ_obj.patch | 65 +++++++++++++++++++ openssl.spec | 6 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 backport-CVE-2023-2650-Restrict-the-size-of-OBJECT-IDENTIFIERs-that-OBJ_obj.patch diff --git a/backport-CVE-2023-2650-Restrict-the-size-of-OBJECT-IDENTIFIERs-that-OBJ_obj.patch b/backport-CVE-2023-2650-Restrict-the-size-of-OBJECT-IDENTIFIERs-that-OBJ_obj.patch new file mode 100644 index 0000000..0e6be32 --- /dev/null +++ b/backport-CVE-2023-2650-Restrict-the-size-of-OBJECT-IDENTIFIERs-that-OBJ_obj.patch @@ -0,0 +1,65 @@ +From 423a2bc737a908ad0c77bda470b2b59dc879936b Mon Sep 17 00:00:00 2001 +From: Richard Levitte +Date: Fri, 12 May 2023 10:00:13 +0200 +Subject: [PATCH] Restrict the size of OBJECT IDENTIFIERs that OBJ_obj2txt will + translate + +OBJ_obj2txt() would translate any size OBJECT IDENTIFIER to canonical +numeric text form. For gigantic sub-identifiers, this would take a very +long time, the time complexity being O(n^2) where n is the size of that +sub-identifier. + +To mitigate this, a restriction on the size that OBJ_obj2txt() will +translate to canonical numeric text form is added, based on RFC 2578 +(STD 58), which says this: + +> 3.5. OBJECT IDENTIFIER values +> +> An OBJECT IDENTIFIER value is an ordered list of non-negative numbers. +> For the SMIv2, each number in the list is referred to as a sub-identifier, +> there are at most 128 sub-identifiers in a value, and each sub-identifier +> has a maximum value of 2^32-1 (4294967295 decimal). + +Fixes otc/security#96 +Fixes CVE-2023-2650 + +Reviewed-by: Matt Caswell +Reviewed-by: Tomas Mraz +--- + NEWS.md | 4 ++++ + crypto/objects/obj_dat.c | 19 +++++++++++++++++++ + 3 files changed, 50 insertions(+) + +diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c +index 01cde00e98..c0e55197a0 100644 +--- a/crypto/objects/obj_dat.c ++++ b/crypto/objects/obj_dat.c +@@ -443,6 +443,25 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name) + first = 1; + bl = NULL; + ++ /* ++ * RFC 2578 (STD 58) says this about OBJECT IDENTIFIERs: ++ * ++ * > 3.5. OBJECT IDENTIFIER values ++ * > ++ * > An OBJECT IDENTIFIER value is an ordered list of non-negative ++ * > numbers. For the SMIv2, each number in the list is referred to as a ++ * > sub-identifier, there are at most 128 sub-identifiers in a value, ++ * > and each sub-identifier has a maximum value of 2^32-1 (4294967295 ++ * > decimal). ++ * ++ * So a legitimate OID according to this RFC is at most (32 * 128 / 7), ++ * i.e. 586 bytes long. ++ * ++ * Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 ++ */ ++ if (len > 586) ++ goto err; ++ + while (len > 0) { + l = 0; + use_bn = 0; +-- +2.27.0 + diff --git a/openssl.spec b/openssl.spec index e3312a7..71577a2 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1f -Release: 24 +Release: 25 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay and GPLv2+ URL: https://www.openssl.org/ @@ -106,6 +106,7 @@ Patch95: backport-x509-excessive-resource-use-verifying-policy-constra.patch Patch96: backport-Ensure-that-EXFLAG_INVALID_POLICY-is-checked-even-in.patch Patch97: backport-Fix-documentation-of-X509_VERIFY_PARAM_add0_policy.patch Patch98: fix-the-test-case-failure.patch +Patch99: backport-CVE-2023-2650-Restrict-the-size-of-OBJECT-IDENTIFIERs-that-OBJ_obj.patch BuildRequires: gcc make lksctp-tools-devel coreutils util-linux zlib-devel @@ -289,6 +290,9 @@ make test || : %{_pkgdocdir}/html/ %changelog +* Mon Jun 12 2023 ExtinctFire - 1:1.1.1f-25 +- fix CVE-2023-2650 + * Thu May 25 2023 wangcheng - 1:1.1.1f-24 - fix the test case failure -- Gitee