Skip to content

Commit db779b0

Browse files
levittet8m
authored andcommitted
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>
1 parent a14ed48 commit db779b0

File tree

3 files changed

+50
-0
lines changed

3 files changed

+50
-0
lines changed

CHANGES.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,32 @@ OpenSSL 3.1
2424

2525
### Changes between 3.1.0 and 3.1.1 [xx XXX xxxx]
2626

27+
* Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic
28+
OBJECT IDENTIFIER sub-identifiers to canonical numeric text form.
29+
30+
OBJ_obj2txt() would translate any size OBJECT IDENTIFIER to canonical
31+
numeric text form. For gigantic sub-identifiers, this would take a very
32+
long time, the time complexity being O(n^2) where n is the size of that
33+
sub-identifier. ([CVE-2023-2650])
34+
35+
To mitigitate this, `OBJ_obj2txt()` will only translate an OBJECT
36+
IDENTIFIER to canonical numeric text form if the size of that OBJECT
37+
IDENTIFIER is 586 bytes or less, and fail otherwise.
38+
39+
The basis for this restriction is RFC 2578 (STD 58), section 3.5. OBJECT
40+
IDENTIFIER values, which stipulates that OBJECT IDENTIFIERS may have at
41+
most 128 sub-identifiers, and that the maximum value that each sub-
42+
identifier may have is 2^32-1 (4294967295 decimal).
43+
44+
For each byte of every sub-identifier, only the 7 lower bits are part of
45+
the value, so the maximum amount of bytes that an OBJECT IDENTIFIER with
46+
these restrictions may occupy is 32 * 128 / 7, which is approximately 586
47+
bytes.
48+
49+
Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5
50+
51+
*Richard Levitte*
52+
2753
* Multiple algorithm implementation fixes for ARM BE platforms.
2854

2955
*Liu-ErMeng*
@@ -19743,6 +19769,7 @@ ndif
1974319769

1974419770
<!-- Links -->
1974519771

19772+
[CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650
1974619773
[CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255
1974719774
[CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466
1974819775
[CVE-2023-0465]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0465

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ OpenSSL 3.1
2121

2222
### Major changes between OpenSSL 3.1.0 and OpenSSL 3.1.1 [under development]
2323

24+
* Mitigate for very slow `OBJ_obj2txt()` performance with gigantic OBJECT
25+
IDENTIFIER sub-identities. ([CVE-2023-2650])
2426
* Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms
2527
([CVE-2023-1255])
2628
* Fixed documentation of X509_VERIFY_PARAM_add0_policy() ([CVE-2023-0466])
@@ -1451,6 +1453,8 @@ OpenSSL 0.9.x
14511453
* Support for various new platforms
14521454

14531455
<!-- Links -->
1456+
1457+
[CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650
14541458
[CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255
14551459
[CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466
14561460
[CVE-2023-0465]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0465

crypto/objects/obj_dat.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,25 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
478478
first = 1;
479479
bl = NULL;
480480

481+
/*
482+
* RFC 2578 (STD 58) says this about OBJECT IDENTIFIERs:
483+
*
484+
* > 3.5. OBJECT IDENTIFIER values
485+
* >
486+
* > An OBJECT IDENTIFIER value is an ordered list of non-negative
487+
* > numbers. For the SMIv2, each number in the list is referred to as a
488+
* > sub-identifier, there are at most 128 sub-identifiers in a value,
489+
* > and each sub-identifier has a maximum value of 2^32-1 (4294967295
490+
* > decimal).
491+
*
492+
* So a legitimate OID according to this RFC is at most (32 * 128 / 7),
493+
* i.e. 586 bytes long.
494+
*
495+
* Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5
496+
*/
497+
if (len > 586)
498+
goto err;
499+
481500
while (len > 0) {
482501
l = 0;
483502
use_bn = 0;

0 commit comments

Comments
 (0)