commit 1296ac8348975b878e9b2b98e414cd7aed29de04
author Paul Elliott <62069445+paul-elliott-arm@users.noreply.github.com> Wed Jan 10 16:57:03 2024 +0000
committer GitHub <noreply@github.com> Wed Jan 10 16:57:03 2024 +0000
tree 54d7366514c2cbcc283d56564df84265e0d0da32
parent 05bd9a945592d17f4e804e928a942cd73e58074b
parent a836a8499e0fc620358dddfd0ce1de95522460c1

Merge pull request #8695 from jwinzig-at-hilscher/mbedtls-2.28

Backport 2.28: Fix bug in mbedtls_x509_set_extension

library/x509_create.c

diff --git a/library/x509_create.c b/library/x509_create.c
index 73789da..4ffd3b6 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -195,6 +195,10 @@
 {
     mbedtls_asn1_named_data *cur;
 
+    if (val_len > (SIZE_MAX  - 1)) {
+        return MBEDTLS_ERR_X509_BAD_INPUT_DATA;
+    }
+
     if ((cur = mbedtls_asn1_store_named_data(head, oid, oid_len,
                                              NULL, val_len + 1)) == NULL) {
         return MBEDTLS_ERR_X509_ALLOC_FAILED;

tests/suites/test_suite_x509write.data

diff --git a/tests/suites/test_suite_x509write.data b/tests/suites/test_suite_x509write.data
index 999c05f..6bb81c7 100644
--- a/tests/suites/test_suite_x509write.data
+++ b/tests/suites/test_suite_x509write.data
@@ -138,3 +138,6 @@
 
 Check max serial length
 x509_set_serial_check:
+
+Check max extension length
+x509_set_extension_length_check:

tests/suites/test_suite_x509write.function

diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index 90c2192..3bff943 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -499,3 +499,24 @@
     USE_PSA_DONE();
 }
 /* END_CASE */
+
+/* BEGIN_CASE depends_on:MBEDTLS_X509_CSR_WRITE_C */
+void x509_set_extension_length_check()
+{
+    int ret = 0;
+
+    mbedtls_x509write_csr ctx;
+    mbedtls_x509write_csr_init(&ctx);
+
+    unsigned char buf[EXT_KEY_USAGE_TMP_BUF_MAX_LENGTH] = { 0 };
+    unsigned char *p = buf + sizeof(buf);
+
+    ret = mbedtls_x509_set_extension(&(ctx.extensions),
+                                     MBEDTLS_OID_EXTENDED_KEY_USAGE,
+                                     MBEDTLS_OID_SIZE(MBEDTLS_OID_EXTENDED_KEY_USAGE),
+                                     0,
+                                     p,
+                                     SIZE_MAX);
+    TEST_ASSERT(MBEDTLS_ERR_X509_BAD_INPUT_DATA == ret);
+}
+/* END_CASE */