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>
diff --git a/library/pkcs7.c b/library/pkcs7.c
index 57b4e96..3481cbd 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/private/oid.h"
+#include "mbedtls/oid.h"
#include "x509_oid.h"
#include "mbedtls/error.h"
diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index fd7e16c..731cbc8 100644
--- a/library/ssl_msg.c
+++ b/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
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c575a42..9144f92 100644
--- a/library/ssl_tls.c
+++ b/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
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 756d529..e88c00a 100644
--- a/library/ssl_tls13_generic.c
+++ b/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"
diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 2a47445..dc50bee 100644
--- a/library/ssl_tls13_server.c
+++ b/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"
diff --git a/library/x509.c b/library/x509.c
index 9d7b4b7..1adff8f 100644
--- a/library/x509.c
+++ b/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>
diff --git a/library/x509_create.c b/library/x509_create.c
index 341d741..370eb9b 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/private/oid.h"
+#include "mbedtls/oid.h"
#include "x509_oid.h"
#include <limits.h>
diff --git a/library/x509_crl.c b/library/x509_crl.c
index e8aca5b..0b98ba4 100644
--- a/library/x509_crl.c
+++ b/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>
diff --git a/library/x509_crt.c b/library/x509_crt.c
index df1dbf6..e6b9252 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/private/oid.h"
+#include "mbedtls/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509_csr.c b/library/x509_csr.c
index e78b5d7..32a3bb2 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/private/oid.h"
+#include "mbedtls/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509_oid.c b/library/x509_oid.c
index 8963529..cc0063b 100644
--- a/library/x509_oid.c
+++ b/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>
diff --git a/library/x509write.c b/library/x509write.c
index 1d4d556..0906a5a 100644
--- a/library/x509write.c
+++ b/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"
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index ccf5a92..663b308 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/private/oid.h"
+#include "mbedtls/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index 88e5e5a..8e37278 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/private/oid.h"
+#include "mbedtls/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform_util.h"