update mbedtls to 2.28.10

Signed-off-by: Thomas Tendyck <[email protected]>

Author: thomasten

CMakeLists.txt

@@ -49,6 +49,23 @@ execute_process(
           3rdparty/mbedtls/mbedtls 3rdparty/musl/musl 3rdparty/musl/libc-test
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/openenclave/openenclave)
 
+# mbedtls 2.28.10
+execute_process(
+  COMMAND git remote add upstream https://github.com/mbed-tls/mbedtls
+  WORKING_DIRECTORY
+    ${CMAKE_SOURCE_DIR}/3rdparty/openenclave/openenclave/3rdparty/mbedtls/mbedtls
+)
+execute_process(
+  COMMAND git fetch upstream 2fc8413bfcb51354c8e679141b17b3f1a5942561
+  WORKING_DIRECTORY
+    ${CMAKE_SOURCE_DIR}/3rdparty/openenclave/openenclave/3rdparty/mbedtls/mbedtls
+)
+execute_process(
+  COMMAND git reset --hard 2fc8413bfcb51354c8e679141b17b3f1a5942561
+  WORKING_DIRECTORY
+    ${CMAKE_SOURCE_DIR}/3rdparty/openenclave/openenclave/3rdparty/mbedtls/mbedtls
+)
+
 add_subdirectory(3rdparty/openenclave)
 add_subdirectory(docs/refman)
 

src/tests/CMakeLists.txt

@@ -35,6 +35,7 @@ add_subdirectory(memfs)
 #add_subdirectory(mmapfs)
 #add_subdirectory(mmapfs2)
 #add_subdirectory(mmapfs3)
+add_subdirectory(mbedtls_version)
 add_subdirectory(meshentry_go_app)
 add_subdirectory(meshentry_nongo_app)
 add_subdirectory(meshentry_premainmock)

src/tests/mbedtls_version/CMakeLists.txt

@@ -0,0 +1,19 @@
+add_custom_command(
+  OUTPUT test_t.c
+  DEPENDS ../test.edl
+  COMMAND openenclave::oeedger8r --trusted
+          ${CMAKE_CURRENT_SOURCE_DIR}/../test.edl ${DEFINE_OE_SGX})
+
+add_enclave_library(erttest_mbedtls_version_lib OBJECT enc.cpp test_t.c)
+enclave_include_directories(erttest_mbedtls_version_lib PRIVATE
+                            ${CMAKE_CURRENT_BINARY_DIR})
+enclave_link_libraries(erttest_mbedtls_version_lib PRIVATE oe_includes)
+set_property(TARGET erttest_mbedtls_version_lib
+             PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+add_enclave(TARGET erttest_mbedtls_version SOURCES ../empty.c)
+enclave_link_libraries(erttest_mbedtls_version erttest_mbedtls_version_lib
+                       ertlibc)
+
+add_test(NAME tests/ert/mbedtls_version COMMAND erttest_host
+                                                erttest_mbedtls_version)

src/tests/mbedtls_version/enc.cpp

@@ -0,0 +1,23 @@
+#include <openenclave/internal/tests.h>
+#include <array>
+#include <cstring>
+#include "test_t.h"
+
+extern "C" void mbedtls_version_get_string(char*);
+
+using namespace std;
+
+void test_ecall()
+{
+    array<char, 9> ver;
+    mbedtls_version_get_string(ver.data());
+    OE_TEST(strcmp(ver.data(), "2.28.10") == 0);
+}
+
+OE_SET_ENCLAVE_SGX(
+    1,    /* ProductID */
+    1,    /* SecurityVersion */
+    true, /* Debug */
+    64,   /* NumHeapPages */
+    64,   /* NumStackPages */
+    1);   /* NumTCS */