Include fixups (headers moves to private directory)

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

include/mbedtls/debug.h

@@ -15,7 +15,7 @@
 #include "mbedtls/ssl.h"
 
 #if defined(MBEDTLS_ECP_C)
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
 #endif
 
 #if defined(MBEDTLS_DEBUG_C)

include/mbedtls/error.h

@@ -11,7 +11,7 @@
 #define MBEDTLS_ERROR_H
 
 #include "mbedtls/build_info.h"
-#include "mbedtls/error_common.h"
+#include "mbedtls/private/error_common.h"
 
 #include <stddef.h>
 

include/mbedtls/ssl.h

@@ -14,8 +14,8 @@
 
 #include "mbedtls/build_info.h"
 
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
 
 #include "mbedtls/ssl_ciphersuites.h"
 
@@ -27,7 +27,7 @@
 #include "mbedtls/md.h"
 
 #if defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDH_OR_ECDHE_ANY_ENABLED)
-#include "mbedtls/ecdh.h"
+#include "mbedtls/private/ecdh.h"
 #endif
 
 #if defined(MBEDTLS_HAVE_TIME)

include/mbedtls/ssl_ciphersuites.h

@@ -14,7 +14,7 @@
 #include "mbedtls/build_info.h"
 
 #include "mbedtls/pk.h"
-#include "mbedtls/cipher.h"
+#include "mbedtls/private/cipher.h"
 #include "mbedtls/md.h"
 
 #ifdef __cplusplus

include/mbedtls/x509.h

@@ -17,7 +17,7 @@
 #include "mbedtls/pk.h"
 
 #if defined(MBEDTLS_RSA_C)
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
 #endif
 
 /**

include/mbedtls/x509_crt.h

@@ -15,7 +15,7 @@
 
 #include "mbedtls/x509.h"
 #include "mbedtls/x509_crl.h"
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
 
 /**
  * \addtogroup x509_module

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 "mbedtls/private/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/error.h"
 

library/ssl_misc.h

@@ -19,26 +19,26 @@
 #include "mbedtls/debug.h"
 #include "debug_internal.h"
 
-#include "mbedtls/cipher.h"
+#include "mbedtls/private/cipher.h"
 
 #include "psa/crypto.h"
 #include "psa_util_internal.h"
 extern const mbedtls_error_pair_t psa_to_ssl_errors[7];
 
 #if defined(PSA_WANT_ALG_MD5)
-#include "mbedtls/md5.h"
+#include "mbedtls/private/md5.h"
 #endif
 
 #if defined(PSA_WANT_ALG_SHA_1)
-#include "mbedtls/sha1.h"
+#include "mbedtls/private/sha1.h"
 #endif
 
 #if defined(PSA_WANT_ALG_SHA_256)
-#include "mbedtls/sha256.h"
+#include "mbedtls/private/sha256.h"
 #endif
 
 #if defined(PSA_WANT_ALG_SHA_512)
-#include "mbedtls/sha512.h"
+#include "mbedtls/private/sha512.h"
 #endif
 
 #include "mbedtls/pk.h"

library/ssl_msg.c

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

library/ssl_tls12_server.c

@@ -34,7 +34,7 @@ static int local_err_translation(psa_status_t status)
 #endif
 
 #if defined(MBEDTLS_ECP_C)
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
 #endif
 
 #if defined(MBEDTLS_HAVE_TIME)

library/ssl_tls13_generic.c

@@ -13,7 +13,7 @@
 
 #include "mbedtls/error.h"
 #include "debug_internal.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/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/oid.h"
+#include "mbedtls/private/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/oid.h"
+#include "mbedtls/private/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/oid.h"
+#include "mbedtls/private/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/oid.h"
+#include "mbedtls/private/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/oid.h"
+#include "mbedtls/private/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/oid.h"
+#include "mbedtls/private/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/platform_util.h"
 

library/x509_internal.h

@@ -19,7 +19,7 @@
 #include "pk_internal.h"
 
 #if defined(MBEDTLS_RSA_C)
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
 #endif
 
 int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,

library/x509_oid.c

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

programs/fuzz/fuzz_client.c

@@ -1,8 +1,8 @@
 #define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
 
 #include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "test/certs.h"
 #include "fuzz_common.h"
 #include <string.h>

programs/fuzz/fuzz_dtlsclient.c

@@ -6,8 +6,8 @@
 #include "fuzz_common.h"
 #include "mbedtls/ssl.h"
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/timing.h"
 #include "test/certs.h"
 

programs/fuzz/fuzz_dtlsserver.c

@@ -7,8 +7,8 @@
 #include "mbedtls/ssl.h"
 #include "test/certs.h"
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/timing.h"
 #include "mbedtls/ssl_cookie.h"
 

programs/fuzz/fuzz_server.c

@@ -1,8 +1,8 @@
 #define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
 
 #include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/ssl_ticket.h"
 #include "test/certs.h"
 #include "fuzz_common.h"

programs/ssl/dtls_client.c

@@ -31,8 +31,8 @@ int main(void)
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/error.h"
 #include "mbedtls/timing.h"
 #include "test/certs.h"

programs/ssl/dtls_server.c

@@ -45,8 +45,8 @@ int main(void)
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/ssl_cookie.h"

programs/ssl/mini_client.c

@@ -43,8 +43,8 @@ int main(void)
 
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>

programs/ssl/ssl_client1.c

@@ -27,8 +27,8 @@ int main(void)
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/error.h"
 #include "test/certs.h"
 

programs/ssl/ssl_fork_server.c

@@ -31,8 +31,8 @@ int main(void)
 }
 #else
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"

programs/ssl/ssl_mail_client.c

@@ -38,8 +38,8 @@ int main(void)
 #include "mbedtls/error.h"
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "test/certs.h"
 #include "mbedtls/x509.h"
 

programs/ssl/ssl_pthread_server.c

@@ -38,8 +38,8 @@ int main(void)
 #include <windows.h>
 #endif
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/net_sockets.h"

programs/ssl/ssl_server.c

@@ -31,8 +31,8 @@ int main(void)
 #include <windows.h>
 #endif
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/net_sockets.h"

programs/ssl/ssl_test_lib.h

@@ -43,9 +43,9 @@
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/ssl_ciphersuites.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
-#include "mbedtls/hmac_drbg.h"
+#include "mbedtls/private/hmac_drbg.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"

programs/test/selftest.c

@@ -9,31 +9,31 @@
 
 #include "mbedtls/build_info.h"
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/hmac_drbg.h"
+#include "mbedtls/private/hmac_drbg.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
-#include "mbedtls/gcm.h"
+#include "mbedtls/private/gcm.h"
-#include "mbedtls/ccm.h"
+#include "mbedtls/private/ccm.h"
-#include "mbedtls/cmac.h"
+#include "mbedtls/private/cmac.h"
-#include "mbedtls/md5.h"
+#include "mbedtls/private/md5.h"
-#include "mbedtls/ripemd160.h"
+#include "mbedtls/private/ripemd160.h"
-#include "mbedtls/sha1.h"
+#include "mbedtls/private/sha1.h"
-#include "mbedtls/sha256.h"
+#include "mbedtls/private/sha256.h"
-#include "mbedtls/sha512.h"
+#include "mbedtls/private/sha512.h"
-#include "mbedtls/sha3.h"
+#include "mbedtls/private/sha3.h"
-#include "mbedtls/aes.h"
+#include "mbedtls/private/aes.h"
-#include "mbedtls/camellia.h"
+#include "mbedtls/private/camellia.h"
-#include "mbedtls/aria.h"
+#include "mbedtls/private/aria.h"
-#include "mbedtls/chacha20.h"
+#include "mbedtls/private/chacha20.h"
-#include "mbedtls/poly1305.h"
+#include "mbedtls/private/poly1305.h"
-#include "mbedtls/chachapoly.h"
+#include "mbedtls/private/chachapoly.h"
 #include "mbedtls/base64.h"
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
 #include "mbedtls/x509.h"
-#include "mbedtls/pkcs5.h"
+#include "mbedtls/private/pkcs5.h"
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
-#include "mbedtls/ecjpake.h"
+#include "mbedtls/private/ecjpake.h"
 #include "mbedtls/timing.h"
 #include "mbedtls/nist_kw.h"
 #include "mbedtls/debug.h"

programs/x509/cert_app.c

@@ -27,8 +27,8 @@ int main(void)
 }
 #else
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/x509.h"

programs/x509/cert_req.c

@@ -29,8 +29,8 @@ int main(void)
 #else
 
 #include "mbedtls/x509_csr.h"
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
 #include "mbedtls/error.h"
 
 #include <stdio.h>

programs/x509/cert_write.c

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

tests/psa-client-server/psasim/src/aut_psa_random.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
 
 #define BUFFER_SIZE 100
 

tests/suites/test_suite_pkcs7.function

@@ -1,14 +1,14 @@
 /* BEGIN_HEADER */
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
 #include "mbedtls/pkcs7.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_crl.h"
 #include "x509_internal.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
 #include "sys/types.h"
 #include "sys/stat.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
 #include "mbedtls/error.h"
 /* END_HEADER */
 

tests/suites/test_suite_x509parse.function

@@ -1,12 +1,12 @@
 /* BEGIN_HEADER */
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_crl.h"
 #include "mbedtls/x509_csr.h"
 #include "x509_internal.h"
 #include "mbedtls/pem.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
 #include "x509_oid.h"
 #include "mbedtls/base64.h"
 #include "mbedtls/error.h"

tests/suites/test_suite_x509write.function

@@ -1,12 +1,12 @@
 /* BEGIN_HEADER */
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_csr.h"
 #include "x509_internal.h"
 #include "mbedtls/pem.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
 #include "x509_oid.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
 #include "mbedtls/asn1.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/pk.h"