Rename ssl_internal.h to ssl_misc.h
Signed-off-by: Chris Jones <christopher.jones@arm.com>
diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h
index 1cafa6e..f5f56b5 100644
--- a/include/mbedtls/cipher.h
+++ b/include/mbedtls/cipher.h
@@ -229,13 +229,13 @@
/** Maximum length of any IV, in Bytes. */
/* This should ideally be derived automatically from list of ciphers.
* This should be kept in sync with MBEDTLS_SSL_MAX_IV_LENGTH defined
- * in ssl_internal.h. */
+ * in ssl_misc.h. */
#define MBEDTLS_MAX_IV_LENGTH 16
/** Maximum block size of any cipher, in Bytes. */
/* This should ideally be derived automatically from list of ciphers.
* This should be kept in sync with MBEDTLS_SSL_MAX_BLOCK_LENGTH defined
- * in ssl_internal.h. */
+ * in ssl_misc.h. */
#define MBEDTLS_MAX_BLOCK_LENGTH 16
/** Maximum key length, in Bytes. */
@@ -243,7 +243,7 @@
* For now, only check whether XTS is enabled which uses 64 Byte keys,
* and use 32 Bytes as an upper bound for the maximum key length otherwise.
* This should be kept in sync with MBEDTLS_SSL_MAX_BLOCK_LENGTH defined
- * in ssl_internal.h, which however deliberately ignores the case of XTS
+ * in ssl_misc.h, which however deliberately ignores the case of XTS
* since the latter isn't used in SSL/TLS. */
#if defined(MBEDTLS_CIPHER_MODE_XTS)
#define MBEDTLS_MAX_KEY_LENGTH 64
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 7815ad9..16ed5b7 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -619,7 +619,7 @@
typedef struct mbedtls_ssl_context mbedtls_ssl_context;
typedef struct mbedtls_ssl_config mbedtls_ssl_config;
-/* Defined in ssl_internal.h */
+/* Defined in ssl_misc.h */
typedef struct mbedtls_ssl_transform mbedtls_ssl_transform;
typedef struct mbedtls_ssl_handshake_params mbedtls_ssl_handshake_params;
typedef struct mbedtls_ssl_sig_hash_set_t mbedtls_ssl_sig_hash_set_t;
diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index 141c480..bb5007b 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -34,7 +34,7 @@
#endif
#include "mbedtls/ssl_cache.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include <string.h>
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 27e0246..be68bcd 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -30,7 +30,7 @@
#endif
#include "mbedtls/ssl.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "mbedtls/debug.h"
#include "mbedtls/error.h"
diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index 0824cd9..fa89a07 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -33,7 +33,7 @@
#endif
#include "mbedtls/ssl_cookie.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
diff --git a/library/ssl_internal.h b/library/ssl_misc.h
similarity index 99%
rename from library/ssl_internal.h
rename to library/ssl_misc.h
index 2097a6d..85f7fc4 100644
--- a/library/ssl_internal.h
+++ b/library/ssl_misc.h
@@ -1,5 +1,5 @@
/**
- * \file ssl_internal.h
+ * \file ssl_misc.h
*
* \brief Internal functions shared by the SSL modules
*/
@@ -19,8 +19,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef MBEDTLS_SSL_INTERNAL_H
-#define MBEDTLS_SSL_INTERNAL_H
+#ifndef MBEDTLS_SSL_MISC_H
+#define MBEDTLS_SSL_MISC_H
#if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h"
@@ -1306,4 +1306,4 @@
void mbedtls_ssl_flight_free( mbedtls_ssl_flight_item *flight );
#endif /* MBEDTLS_SSL_PROTO_DTLS */
-#endif /* ssl_internal.h */
+#endif /* ssl_misc.h */
diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 06da868..17348f1 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -39,7 +39,7 @@
#endif
#include "mbedtls/ssl.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "mbedtls/debug.h"
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 9385d4f..66b9654 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -30,7 +30,7 @@
#endif
#include "mbedtls/ssl.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "mbedtls/debug.h"
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index cd1ea7e..940e1a6 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -29,7 +29,7 @@
#define mbedtls_free free
#endif
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "mbedtls/ssl_ticket.h"
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 659ef6b..59870bf 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -38,7 +38,7 @@
#endif
#include "mbedtls/ssl.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "mbedtls/debug.h"
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index f197c05..4e8fb43 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -22,7 +22,7 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
#include "mbedtls/hkdf.h"
-#include "ssl_internal.h"
+#include "ssl_misc.h"
#include "ssl_tls13_keys.h"
#include <stdint.h>
diff --git a/programs/test/query_config.c b/programs/test/query_config.c
index 0bb6c1c..93bca4b 100644
--- a/programs/test/query_config.c
+++ b/programs/test/query_config.c
@@ -101,7 +101,7 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_csr.h"
#include "mbedtls/xtea.h"
-#include "../../library/ssl_internal.h"
+#include "../../library/ssl_misc.h"
#include <string.h>
diff --git a/scripts/data_files/query_config.fmt b/scripts/data_files/query_config.fmt
index eff225e..ef8f717 100644
--- a/scripts/data_files/query_config.fmt
+++ b/scripts/data_files/query_config.fmt
@@ -101,7 +101,7 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_csr.h"
#include "mbedtls/xtea.h"
-#include "../../library/ssl_internal.h"
+#include "../../library/ssl_misc.h"
#include <string.h>
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index bd28277..cff642b 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1,6 +1,6 @@
/* BEGIN_HEADER */
#include <mbedtls/ssl.h>
-#include <ssl_internal.h>
+#include <ssl_misc.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/entropy.h>
#include <mbedtls/certs.h>
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 350eea8..7c79493 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -251,8 +251,8 @@
<ClInclude Include="..\..\library\psa_crypto_slot_management.h" />
<ClInclude Include="..\..\library\psa_crypto_storage.h" />
<ClInclude Include="..\..\library\rsa_internal.h" />
- <ClInclude Include="..\..\library\ssl_internal.h" />
<ClInclude Include="..\..\library\ssl_invasive.h" />
+ <ClInclude Include="..\..\library\ssl_misc.h" />
<ClInclude Include="..\..\library\ssl_tls13_keys.h" />
<ClInclude Include="..\..\3rdparty\everest\include\everest\everest.h" />
<ClInclude Include="..\..\3rdparty\everest\include\everest\Hacl_Curve25519.h" />
