From 82d7314c434338ff34b8dc43f0981ae1fb6f07e9 Mon Sep 17 00:00:00 2001
From: Andres Amaya Garcia <andres.amayagarcia@arm.com>
Date: Wed, 12 Jul 2017 11:25:17 +0100
Subject: [PATCH] Remove internal functions from setup API

---
 include/mbedtls/platform.h | 21 ++++-----------------
 library/platform.c         | 18 ++++--------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h
index a9ff7e421..29b80cd3e 100644
--- a/include/mbedtls/platform.h
+++ b/include/mbedtls/platform.h
@@ -289,6 +289,10 @@ int mbedtls_platform_set_nv_seed(
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
 
 #if !defined(MBEDTLS_PLATFORM_SETUP_ALT)
+struct mbedtls_platform_context {
+    char dummy; /**< Placeholder member as empty structs are not portable */
+};
+
 typedef struct mbedtls_platform_context mbedtls_platform_context;
 #else
 #include "platform_alt.h"
@@ -316,23 +320,6 @@ int mbedtls_platform_setup( mbedtls_platform_context *ctx );
  */
 void mbedtls_platform_teardown( mbedtls_platform_context *ctx );
 
-/**
- * \brief   Internal function to perform any platform initialisation operations
- *          Only exposed to allow overriding it, see MBEDTLS_PLATFORM_SETUP_ALT
- *
- * \param   ctx     mbed TLS context
- *
- * \return  0 if successful
- */
-int mbedtls_internal_platform_setup( mbedtls_platform_context *ctx );
-/**
- * \brief   Internal function to perform any platform teardown operations
- *          Only exposed to allow overriding it, see MBEDTLS_PLATFORM_SETUP_ALT
- *
- * \param   ctx     mbed TLS context
- */
-void mbedtls_internal_platform_teardown( mbedtls_platform_context *ctx );
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/library/platform.c b/library/platform.c
index 2ac67cbe9..f739f2f0f 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -304,21 +304,11 @@ int mbedtls_platform_set_nv_seed(
 #endif /* MBEDTLS_PLATFORM_NV_SEED_ALT */
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
 
-int mbedtls_platform_setup( mbedtls_platform_context *ctx )
-{
-    return( mbedtls_internal_platform_setup( ctx ) );
-}
-
-void mbedtls_platform_teardown( mbedtls_platform_context *ctx )
-{
-    mbedtls_internal_platform_teardown( ctx );
-}
-
 #if !defined(MBEDTLS_PLATFORM_SETUP_ALT)
 /*
- * Placeholder internal platform setup that does nothing by default
+ * Placeholder platform setup that does nothing by default
  */
-int mbedtls_internal_platform_setup( mbedtls_platform_context *ctx )
+int mbedtls_platform_setup( mbedtls_platform_context *ctx )
 {
     (void)ctx;
 
@@ -326,9 +316,9 @@ int mbedtls_internal_platform_setup( mbedtls_platform_context *ctx )
 }
 
 /*
- * Placeholder internal platform teardown that does nothing by default
+ * Placeholder platform teardown that does nothing by default
  */
-void mbedtls_internal_platform_teardown( mbedtls_platform_context *ctx )
+void mbedtls_platform_teardown( mbedtls_platform_context *ctx )
 {
     (void)ctx;
 }