From daacb59c2e287a14efa4b99537f8f8edaa9cc7e0 Mon Sep 17 00:00:00 2001
From: Chris Jones <christopher.jones@arm.com>
Date: Tue, 9 Mar 2021 17:03:29 +0000
Subject: [PATCH] Rename <pk/md/cipher>_internal.h to *_wrap.h

Revert changes introduced in 50518f419589d2c4746f4b6d6be0a2569a3386a8
as it is now clear that these headers are internal without the
`*_internal.h` suffix.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
 include/mbedtls/md.h                         | 2 +-
 library/cipher.c                             | 2 +-
 library/cipher_wrap.c                        | 2 +-
 library/{cipher_internal.h => cipher_wrap.h} | 2 +-
 library/md.c                                 | 2 +-
 library/{md_internal.h => md_wrap.h}         | 2 +-
 library/pk.c                                 | 2 +-
 library/pk_wrap.c                            | 2 +-
 library/{pk_internal.h => pk_wrap.h}         | 2 +-
 library/psa_crypto.c                         | 4 ++--
 programs/ssl/ssl_context_info.c              | 2 +-
 tests/suites/test_suite_hkdf.function        | 2 +-
 visualc/VS2010/mbedTLS.vcxproj               | 6 +++---
 13 files changed, 16 insertions(+), 16 deletions(-)
 rename library/{cipher_internal.h => cipher_wrap.h} (99%)
 rename library/{md_internal.h => md_wrap.h} (99%)
 rename library/{pk_internal.h => pk_wrap.h} (99%)

diff --git a/include/mbedtls/md.h b/include/mbedtls/md.h
index e4354badc..25e785e12 100644
--- a/include/mbedtls/md.h
+++ b/include/mbedtls/md.h
@@ -79,7 +79,7 @@ typedef enum {
 #endif
 
 /**
- * Opaque struct defined in md_internal.h.
+ * Opaque struct defined in md_wrap.h.
  */
 typedef struct mbedtls_md_info_t mbedtls_md_info_t;
 
diff --git a/library/cipher.c b/library/cipher.c
index 8d5bff665..c88d6666d 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -26,7 +26,7 @@
 #if defined(MBEDTLS_CIPHER_C)
 
 #include "mbedtls/cipher.h"
-#include "cipher_internal.h"
+#include "cipher_wrap.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
 
diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index 35bd76f3e..7f2338725 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -25,7 +25,7 @@
 
 #if defined(MBEDTLS_CIPHER_C)
 
-#include "cipher_internal.h"
+#include "cipher_wrap.h"
 #include "mbedtls/error.h"
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
diff --git a/library/cipher_internal.h b/library/cipher_wrap.h
similarity index 99%
rename from library/cipher_internal.h
rename to library/cipher_wrap.h
index 2484c01c7..5635982b4 100644
--- a/library/cipher_internal.h
+++ b/library/cipher_wrap.h
@@ -1,5 +1,5 @@
 /**
- * \file cipher_internal.h
+ * \file cipher_wrap.h
  *
  * \brief Cipher wrappers.
  *
diff --git a/library/md.c b/library/md.c
index 6553393f8..4f9c1d0fa 100644
--- a/library/md.c
+++ b/library/md.c
@@ -26,7 +26,7 @@
 #if defined(MBEDTLS_MD_C)
 
 #include "mbedtls/md.h"
-#include "md_internal.h"
+#include "md_wrap.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
 
diff --git a/library/md_internal.h b/library/md_wrap.h
similarity index 99%
rename from library/md_internal.h
rename to library/md_wrap.h
index f33cdf608..83a5ba35e 100644
--- a/library/md_internal.h
+++ b/library/md_wrap.h
@@ -1,5 +1,5 @@
 /**
- * \file md_internal.h
+ * \file md_wrap.h
  *
  * \brief Message digest wrappers.
  *
diff --git a/library/pk.c b/library/pk.c
index 3824e7912..16b2dd046 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -21,7 +21,7 @@
 
 #if defined(MBEDTLS_PK_C)
 #include "mbedtls/pk.h"
-#include "pk_internal.h"
+#include "pk_wrap.h"
 
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 74d7ce16c..a454f1a91 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -20,7 +20,7 @@
 #include "common.h"
 
 #if defined(MBEDTLS_PK_C)
-#include "pk_internal.h"
+#include "pk_wrap.h"
 #include "mbedtls/error.h"
 
 /* Even if RSA not activated, for the sake of RSA-alt */
diff --git a/library/pk_internal.h b/library/pk_wrap.h
similarity index 99%
rename from library/pk_internal.h
rename to library/pk_wrap.h
index 47f776770..f7f938a88 100644
--- a/library/pk_internal.h
+++ b/library/pk_wrap.h
@@ -1,5 +1,5 @@
 /**
- * \file pk_internal.h
+ * \file pk_wrap.h
  *
  * \brief Public Key abstraction layer: wrapper functions
  */
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2213657ff..5c0e84c0a 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -73,9 +73,9 @@
 #include "mbedtls/md4.h"
 #include "mbedtls/md5.h"
 #include "mbedtls/md.h"
-#include "md_internal.h"
+#include "md_wrap.h"
 #include "mbedtls/pk.h"
-#include "pk_internal.h"
+#include "pk_wrap.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
 #include "mbedtls/ripemd160.h"
diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c
index 868951b60..929a0f29a 100644
--- a/programs/ssl/ssl_context_info.c
+++ b/programs/ssl/ssl_context_info.c
@@ -48,7 +48,7 @@ int main( void )
 #include "mbedtls/error.h"
 #include "mbedtls/base64.h"
 #include "mbedtls/md.h"
-#include "../../library/md_internal.h"
+#include "../../library/md_wrap.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/ssl_ciphersuites.h"
 
diff --git a/tests/suites/test_suite_hkdf.function b/tests/suites/test_suite_hkdf.function
index 174d6accf..6cb111830 100644
--- a/tests/suites/test_suite_hkdf.function
+++ b/tests/suites/test_suite_hkdf.function
@@ -1,6 +1,6 @@
 /* BEGIN_HEADER */
 #include "mbedtls/hkdf.h"
-#include "md_internal.h"
+#include "md_wrap.h"
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 3459397c7..8313c111b 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -236,11 +236,11 @@
     <ClInclude Include="..\..\tests\include\test\drivers\test_driver.h" />
     <ClInclude Include="..\..\library\bn_mul.h" />
     <ClInclude Include="..\..\library\check_crypto_config.h" />
-    <ClInclude Include="..\..\library\cipher_internal.h" />
+    <ClInclude Include="..\..\library\cipher_wrap.h" />
     <ClInclude Include="..\..\library\common.h" />
     <ClInclude Include="..\..\library\ecp_alt.h" />
-    <ClInclude Include="..\..\library\md_internal.h" />
-    <ClInclude Include="..\..\library\pk_internal.h" />
+    <ClInclude Include="..\..\library\md_wrap.h" />
+    <ClInclude Include="..\..\library\pk_wrap.h" />
     <ClInclude Include="..\..\library\psa_crypto_core.h" />
     <ClInclude Include="..\..\library\psa_crypto_driver_wrappers.h" />
     <ClInclude Include="..\..\library\psa_crypto_invasive.h" />