Unfortunately, we had two files named oid.h - one in the main repo, and one in the tf-psa-crypto repo, and these files included the mbedtls one, so I restored the header include

Signed-off-by: Anton Matkin <anton.matkin@arm.com>

library/pkcs7.c

@@ -9,7 +9,7 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_crl.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/error.h"
 

library/ssl_msg.c

@@ -30,7 +30,7 @@
 #include "psa/crypto.h"
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #endif
 
 /* Define a local translating function to save code size by not using too many

library/ssl_tls.c

@@ -34,7 +34,7 @@
 #include "psa/crypto.h"
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #endif
 
 /* Define local translating functions to save code size by not using too many

library/ssl_tls13_generic.c

@@ -13,7 +13,7 @@
 
 #include "mbedtls/error.h"
 #include "debug_internal.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/constant_time.h"
 #include "psa/crypto.h"

library/ssl_tls13_server.c

@@ -13,7 +13,7 @@
 #include "mbedtls/error.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/constant_time.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "mbedtls/psa_util.h"
 
 #include "ssl_tls13_keys.h"

library/x509.c

@@ -21,7 +21,7 @@
 
 #include "mbedtls/asn1.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 
 #include <limits.h>

library/x509_create.c

@@ -11,7 +11,7 @@
 
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 
 #include <limits.h>

library/x509_crl.c

@@ -21,7 +21,7 @@
 
 #include "mbedtls/x509_crl.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "mbedtls/platform_util.h"
 
 #include <string.h>

library/x509_crt.c

@@ -23,7 +23,7 @@
 
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 

library/x509_csr.c

@@ -21,7 +21,7 @@
 
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 

library/x509_oid.c

@@ -14,7 +14,7 @@
  * disabled. */
 #if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
 
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 
 #include <stdio.h>

library/x509write.c

@@ -11,7 +11,7 @@
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/platform_util.h"
 

library/x509write_crt.c

@@ -18,7 +18,7 @@
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/platform_util.h"

library/x509write_csr.c

@@ -17,7 +17,7 @@
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/error.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 

programs/x509/cert_write.c

@@ -30,7 +30,7 @@ int main(void)
 
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_csr.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "mbedtls/private/entropy.h"
 #include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/error.h"

tests/suites/test_suite_pkcs7.function

@@ -5,7 +5,7 @@
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_crl.h"
 #include "x509_internal.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "sys/types.h"
 #include "sys/stat.h"
 #include "mbedtls/private/rsa.h"

tests/suites/test_suite_x509parse.function

@@ -6,7 +6,7 @@
 #include "mbedtls/x509_csr.h"
 #include "x509_internal.h"
 #include "mbedtls/pem.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/base64.h"
 #include "mbedtls/error.h"

tests/suites/test_suite_x509write.function

@@ -4,7 +4,7 @@
 #include "mbedtls/x509_csr.h"
 #include "x509_internal.h"
 #include "mbedtls/pem.h"
-#include "mbedtls/private/oid.h"
+#include "mbedtls/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/private/rsa.h"
 #include "mbedtls/asn1.h"