Harden ASN1_mbstring_ncopy - #29376

Closed

jogme wants to merge 2 commits into

openssl:masterfrom

jogme commented Dec 11, 2025

Contributor

Some output values were incorrectly checked against UTF8.

Checklist

documentation is added or updated
tests are added or updated

jogme requested a review from vdukhovni

December 11, 2025 12:01

jogme commented Dec 11, 2025

Contributor Author

@vdukhovni I added two missing checks for UTF8_putc; PTAL

jogme force-pushed the utf8_cpy branch 2 times, most recently from 92eedd7 to 0936dd7 Compare

December 11, 2025 12:47

vdukhovni requested changes

View reviewed changes

vdukhovni left a comment

Basically fine. Just suggesting adding comments to highlight the interdependence of the code in type_str() and the output selection in ASN1_mbstring_ncopy().

crypto/asn1/a_mbstr.c


          Harden ASN1_mbstring_ncopy

bd42777

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

jogme force-pushed the utf8_cpy branch from 0936dd7 to 12d37f8 Compare

December 11, 2025 13:26

loci-dev mentioned this pull request

UPSTREAM PR #29376: Harden ASN1_mbstring_ncopy auroralabs-loci/openssl#194

Open

2 tasks

shahsb reviewed

View reviewed changes

shahsb left a comment

Contributor

Add a CHANGES entry for 3.3 (or next stable) mentioning "ASN.1: Harden mbstring copy against invalid UTF-8". Run fuzzing (e.g., via oss-fuzz) on this post-merge.

crypto/asn1/a_mbstr.c

                       outlen = 0;
-                      traverse_string(in, len, inform, out_utf8, &outlen);
+                      ret = traverse_string(in, len, inform, out_utf8, &outlen);
+                      if (ret < 0) {

shahsb Dec 14, 2025

Contributor

The traverse_string error handling assumes ret < 0 means invalid UTF-8, but confirm if traverse_string can return other negative values (e.g., out-of-memory). If so, consider a specific error code.

mbroz Dec 15, 2025

Member

I think this code is ok, it should not return other logic error than invalid string here.

crypto/asn1/a_mbstr.c

test/asn1_internal_test.c

test/asn1_internal_test.c

vdukhovni previously approved these changes

View reviewed changes

vdukhovni left a comment •

edited

Loading

LGTM + minor nit.

crypto/asn1/a_strex.c Outdated

jogme dismissed vdukhovni’s stale review via

08e6f56

December 15, 2025 08:42

jogme force-pushed the utf8_cpy branch from 12d37f8 to 08e6f56 Compare

December 15, 2025 08:42

jogme requested a review from t8m

December 15, 2025 08:43

vdukhovni requested changes

View reviewed changes

crypto/asn1/a_strex.c


          Check return code of UTF8_putc

2b122d4

Signed-off-by: Norbert Pocs <[email protected]>

jogme force-pushed the utf8_cpy branch from 08e6f56 to 2b122d4 Compare

December 15, 2025 09:03

vdukhovni approved these changes

View reviewed changes

vdukhovni left a comment

Reconfirmed.

vdukhovni requested review from Sashan and mbroz

December 15, 2025 12:43

mbroz approved these changes

View reviewed changes

mbroz left a comment

Member

LGTM, in fact it is mostly "check return codes" hardening we should use everywhere...

crypto/asn1/a_mbstr.c

                       outlen = 0;
-                      traverse_string(in, len, inform, out_utf8, &outlen);
+                      ret = traverse_string(in, len, inform, out_utf8, &outlen);
+                      if (ret < 0) {

mbroz Dec 15, 2025

Member

I think this code is ok, it should not return other logic error than invalid string here.

npajkovsky approved these changes

View reviewed changes

jogme added approval: done branch: master branch: 3.0 branch: 3.3 branch: 3.4 branch: 3.5 branch: 3.6 labels

openssl-machine added approval: ready to merge and removed approval: done labels

openssl-machine commented Dec 18, 2025

Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request


          Harden ASN1_mbstring_ncopy

51e8f70

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Check return code of UTF8_putc

53b78f2

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Harden ASN1_mbstring_ncopy

fc70e91

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Check return code of UTF8_putc

41be0f2

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Harden ASN1_mbstring_ncopy

4f13ba3

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Check return code of UTF8_putc

a26a90d

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Harden ASN1_mbstring_ncopy

6ea99ad

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Check return code of UTF8_putc

cda12de

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Harden ASN1_mbstring_ncopy

d4f988c

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Check return code of UTF8_putc

ff62893

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

jogme commented Dec 18, 2025

Contributor Author

Merged to all active branches and resolved mergeconflicts with older branches.

Thank you for the reviews!

jogme closed this

openssl-machine pushed a commit that referenced this pull request


          Harden ASN1_mbstring_ncopy

ad3c3c1

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

openssl-machine pushed a commit that referenced this pull request


          Check return code of UTF8_putc

7e9cac9

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from #29376)

websurfer5 pushed a commit to websurfer5/openssl that referenced this pull request


          Harden ASN1_mbstring_ncopy

181d8bf

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

websurfer5 pushed a commit to websurfer5/openssl that referenced this pull request


          Check return code of UTF8_putc

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

websurfer5 pushed a commit to websurfer5/openssl that referenced this pull request


          Harden ASN1_mbstring_ncopy

3ff5c7e

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

websurfer5 pushed a commit to websurfer5/openssl that referenced this pull request


          Check return code of UTF8_putc

345eb51

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

websurfer5 pushed a commit to websurfer5/openssl that referenced this pull request


          Harden ASN1_mbstring_ncopy

f78458f

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

websurfer5 pushed a commit to websurfer5/openssl that referenced this pull request


          Check return code of UTF8_putc

6e3a89c

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

GhisBntly added a commit to GhisBntly/quictls that referenced this pull request


          AdvViz: cherry-pick 41be0f2 from openssl upstream to fix CVE-2025-69419

507950a

Check return code of UTF8_putc

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl#29376)

raspbian-autopush pushed a commit to raspbian-packages/openssl that referenced this pull request


          Harden ASN1_mbstring_ncopy

1d4ba22

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl/openssl#29376)

Gbp-Pq: Name Harden-ASN1_mbstring_ncopy.patch

raspbian-autopush pushed a commit to raspbian-packages/openssl that referenced this pull request


          Check return code of UTF8_putc

9362dcc

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl/openssl#29376)

Gbp-Pq: Name Check-return-code-of-UTF8_putc.patch

raspbian-autopush pushed a commit to raspbian-packages/openssl that referenced this pull request


          Harden ASN1_mbstring_ncopy

e7e1c54

Reported by Murali Aniruddhan

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl/openssl#29376)

Gbp-Pq: Name Harden-ASN1_mbstring_ncopy.patch

raspbian-autopush pushed a commit to raspbian-packages/openssl that referenced this pull request


          Check return code of UTF8_putc

e4aa3e2

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl/openssl#29376)

Gbp-Pq: Name Check-return-code-of-UTF8_putc.patch

GhisBntly added a commit to GhisBntly/openssl-1.1.1 that referenced this pull request


          cherry-pick 41be0f216404f14457bbf3b9cc488dba60b49296 from openssl-3.0…

72fcb06

….19 to fix CVE-2025-69419:

Check return code of UTF8_putc

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
(Merged from openssl/openssl#29376)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

+1 more reviewer

Labels

approval: ready to merge branch: master branch: 3.0 branch: 3.3 branch: 3.4 branch: 3.5 branch: 3.6