61 строка
2.2 KiB
Diff
61 строка
2.2 KiB
Diff
From: Richard Levitte <levitte@openssl.org>
|
|
Date: Fri, 12 May 2023 08:00:13 +0000 (+0200)
|
|
Subject: Restrict the size of OBJECT IDENTIFIERs that OBJ_obj2txt will translate
|
|
X-Git-Tag: OpenSSL_1_1_1u~2
|
|
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=9e209944b35cf82368071f160a744b6178f9b098
|
|
|
|
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 <matt@openssl.org>
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
---
|
|
|
|
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
|
|
index 7e8de727f3..d699915b20 100644
|
|
--- a/crypto/objects/obj_dat.c
|
|
+++ b/crypto/objects/obj_dat.c
|
|
@@ -428,6 +428,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;
|