commit 8085f51108e75e837430f448d807fc12400db0cf
author Gilles Peskine <Gilles.Peskine@arm.com> Sun Sep 15 12:45:44 2024 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Oct 16 11:52:27 2024 +0200
tree f26886380f9c49d3a997a97fba76a1c55ce2693b
parent ed6feae51387cc58ce4ebacbf3f2c85ea788574d

Use MBEDTLS_ERROR_ADD instead of explicit addition: enforcement

Reject direct additions of error constants (regex-based approximation).

Fix the lone straggler.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 00f3107..d72e2fb 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -679,8 +679,8 @@
     }
 
     if (*p != end) {
-        return MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-               MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_EXTENSIONS,
+                                 MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
 
     return 0;