Skip to content

Commit 423a2bc

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 3ecfc9e commit 423a2bc

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
@@ -30,6 +30,32 @@ breaking changes, and mappings for the large list of deprecated functions.
3030

3131
### Changes between 3.0.8 and 3.0.9 [xx XXX xxxx]
3232

33+
* Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic
34+
OBJECT IDENTIFIER sub-identifiers to canonical numeric text form.
35+
36+
OBJ_obj2txt() would translate any size OBJECT IDENTIFIER to canonical
37+
numeric text form. For gigantic sub-identifiers, this would take a very
38+
long time, the time complexity being O(n^2) where n is the size of that
39+
sub-identifier. ([CVE-2023-2650])
40+
41+
To mitigitate this, `OBJ_obj2txt()` will only translate an OBJECT
42+
IDENTIFIER to canonical numeric text form if the size of that OBJECT
43+
IDENTIFIER is 586 bytes or less, and fail otherwise.
44+
45+
The basis for this restriction is RFC 2578 (STD 58), section 3.5. OBJECT
46+
IDENTIFIER values, which stipulates that OBJECT IDENTIFIERS may have at
47+
most 128 sub-identifiers, and that the maximum value that each sub-
48+
identifier may have is 2^32-1 (4294967295 decimal).
49+
50+
For each byte of every sub-identifier, only the 7 lower bits are part of
51+
the value, so the maximum amount of bytes that an OBJECT IDENTIFIER with
52+
these restrictions may occupy is 32 * 128 / 7, which is approximately 586
53+
bytes.
54+
55+
Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5
56+
57+
*Richard Levitte*
58+
3359
* Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms which
3460
happens if the buffer size is 4 mod 5 in 16 byte AES blocks. This can
3561
trigger a crash of an application using AES-XTS decryption if the memory
@@ -19626,6 +19652,7 @@ ndif
1962619652

1962719653
<!-- Links -->
1962819654

19655+
[CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650
1962919656
[CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255
1963019657
[CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466
1963119658
[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
@@ -20,6 +20,8 @@ OpenSSL 3.0
2020

2121
### Major changes between OpenSSL 3.0.8 and OpenSSL 3.0.9 [under development]
2222

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

14411443
<!-- Links -->
1444+
1445+
[CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650
14421446
[CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255
14431447
[CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466
14441448
[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
@@ -443,6 +443,25 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
443443
first = 1;
444444
bl = NULL;
445445

446+
/*
447+
* RFC 2578 (STD 58) says this about OBJECT IDENTIFIERs:
448+
*
449+
* > 3.5. OBJECT IDENTIFIER values
450+
* >
451+
* > An OBJECT IDENTIFIER value is an ordered list of non-negative
452+
* > numbers. For the SMIv2, each number in the list is referred to as a
453+
* > sub-identifier, there are at most 128 sub-identifiers in a value,
454+
* > and each sub-identifier has a maximum value of 2^32-1 (4294967295
455+
* > decimal).
456+
*
457+
* So a legitimate OID according to this RFC is at most (32 * 128 / 7),
458+
* i.e. 586 bytes long.
459+
*
460+
* Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5
461+
*/
462+
if (len > 586)
463+
goto err;
464+
446465
while (len > 0) {
447466
l = 0;
448467
use_bn = 0;

0 commit comments

Comments
 (0)