commit 86a47f85fa9d33bc7e7fbf12828f66603992800c
author Gilles Peskine <Gilles.Peskine@arm.com> Wed May 07 20:20:12 2025 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Jun 03 15:51:34 2025 +0200
tree 010b4511e99edc579ea6ae05c08e0a70a76cdb70
parent b825dcfe2db9dcfd4da37c422c583b3cae506ea3

Switch to "x509_oid.h" in code that uses OID functions

Keep "mbedtls/oid.h" in code that only uses OID macros.

```
git grep -l mbedtls_oid_ '**/*.[hc]' tests/suites/*.function | xargs perl -i -pe 's!["<]mbedtls/oid\.h[">]!"x509_oid.h"!g'
```

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

library/pkcs7.c

diff --git a/library/pkcs7.c b/library/pkcs7.c
index ff0567c..3c5040b 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -9,7 +9,7 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_crl.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/error.h"
 
 #if defined(MBEDTLS_FS_IO)

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index 9fc6389..e0d54b6 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -21,7 +21,7 @@
 
 #include "mbedtls/asn1.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 
 #include <stdio.h>
 #include <string.h>

library/x509_create.c

diff --git a/library/x509_create.c b/library/x509_create.c
index 48ac080..7ca5517 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -11,7 +11,7 @@
 
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 
 #include <string.h>
 

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index faea404..959ae21 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -23,7 +23,7 @@
 
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 
 #include <string.h>

library/x509_csr.c

diff --git a/library/x509_csr.c b/library/x509_csr.c
index 2e43564..bba9eaa 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -21,7 +21,7 @@
 
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 
 #include <string.h>

library/x509_oid.c

diff --git a/library/x509_oid.c b/library/x509_oid.c
index 1637c1c..6ba04cf 100644
--- a/library/x509_oid.c
+++ b/library/x509_oid.c
@@ -11,7 +11,7 @@
 
 #if defined(MBEDTLS_OID_C)
 
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/error_common.h"
 #include "mbedtls/pk.h"

library/x509write_crt.c

diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 7d20748..4bacdad 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -18,7 +18,7 @@
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/md.h"

library/x509write_csr.c

diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index e65ddb0..74991f3 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -17,7 +17,7 @@
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 
 #include "psa/crypto.h"