commit d24f5feb59369a90e5c8e78f45951e679a3c442d
author Andres Amaya Garcia <andres.amayagarcia@arm.com> Wed Jul 12 11:25:17 2017 +0100
committer Simon Butcher <simon.butcher@arm.com> Thu Jul 27 15:08:01 2017 +0100
tree 48de0b996dbd2dac0e572185f7ad2b401fd1d25c
parent 2187e03817b8b8f902eb14d50f6dfe9aa940ac08

Remove internal functions from setup API

include/mbedtls/platform.h

diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h
index a9ff7e4..29b80cd 100644
--- a/include/mbedtls/platform.h
+++ b/include/mbedtls/platform.h
@@ -289,6 +289,10 @@
 #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 @@
  */
 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

library/platform.c

diff --git a/library/platform.c b/library/platform.c
index 2ac67cb..f739f2f 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -304,21 +304,11 @@
 #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 @@
 }
 
 /*
- * 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;
 }