Merge pull request ARMmbed#120 from ARMmbed/sync_with_mbedos_2

Sync with mbedos
artokin · Feb 25, 2019 · 227cc3d · 227cc3d
2 parents 5feb8dd + 88894d1
commit 227cc3d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/source/coap_security_handler.c b/source/coap_security_handler.c
@@ -102,6 +102,12 @@ static int coap_security_handler_init(coap_security_t *sec)
  const int entropy_source_type = MBEDTLS_ENTROPY_SOURCE_WEAK;
 #endif
 
+#if defined(MBEDTLS_PLATFORM_C)
+ if (mbedtls_platform_setup(NULL) != 0) {
+ return -1;
+ }
+#endif /* MBEDTLS_PLATFORM_C */
+
  mbedtls_ssl_init(&sec->_ssl);
  mbedtls_ssl_config_init(&sec->_conf);
  mbedtls_ctr_drbg_init(&sec->_ctr_drbg);
@@ -153,6 +159,9 @@ static void coap_security_handler_reset(coap_security_t *sec)
  mbedtls_ctr_drbg_free(&sec->_ctr_drbg);
  mbedtls_ssl_config_free(&sec->_conf);
  mbedtls_ssl_free(&sec->_ssl);
+#if defined(MBEDTLS_PLATFORM_C)
+ mbedtls_platform_teardown(NULL);
+#endif /* MBEDTLS_PLATFORM_C */
 }
 
 

diff --git a/test/coap-service/unittest/stub/mbedtls_stub.c b/test/coap-service/unittest/stub/mbedtls_stub.c
@@ -387,3 +387,15 @@ int mbedtls_ssl_session_reset(mbedtls_ssl_context *ssl)
 void mbedtls_strerror(int ret, char *buf, size_t buflen)
 {
 }
+
+int mbedtls_platform_setup(mbedtls_platform_context *ctx)
+{
+ (void)ctx;
+
+ return (0);
+}
+
+void mbedtls_platform_teardown(mbedtls_platform_context *ctx)
+{
+ (void)ctx;
+}
diff --git a/test/coap-service/unittest/stub/mbedtls_stub.h b/test/coap-service/unittest/stub/mbedtls_stub.h
@@ -28,7 +28,7 @@
 #include "mbedtls/sha256.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/pk.h"
-
+#include "mbedtls/platform.h"
 
 
 #define HANDSHAKE_FINISHED_VALUE 8888