From 572a1749fe5942384e7f049695edaf0a2d26f4f2 Mon Sep 17 00:00:00 2001
From: Thomas Tendyck <tt@edgeless.systems>
Date: Thu, 13 Jun 2024 17:41:26 +0200
Subject: [PATCH] update OE to v0.19.6

Signed-off-by: Thomas Tendyck <tt@edgeless.systems>
---
 3rdparty/openenclave/ert.patch   | 27 ++-------------------------
 3rdparty/openenclave/openenclave |  2 +-
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/3rdparty/openenclave/ert.patch b/3rdparty/openenclave/ert.patch
index 3298c0fb4..ac19f1fa8 100644
--- a/3rdparty/openenclave/ert.patch
+++ b/3rdparty/openenclave/ert.patch
@@ -3152,29 +3152,6 @@ index 7dbe08967..578987fe3 100644
      add_subdirectory(sim-mode)
      add_subdirectory(stdc)
      add_subdirectory(stdcxx)
-diff --git a/tests/crypto/enclave/enc/enc.c b/tests/crypto/enclave/enc/enc.c
-index 67f426bca..26769f115 100644
---- a/tests/crypto/enclave/enc/enc.c
-+++ b/tests/crypto/enclave/enc/enc.c
-@@ -168,7 +168,7 @@ static long _syscall_dispatch(
-         OE_SYSCALL_DISPATCH(SYS_readv, arg1, arg2, arg3);
-         OE_SYSCALL_DISPATCH(SYS_close, arg1);
-         default:
--            return -1;
-+            return -2;
-     }
- }
- 
-@@ -190,7 +190,8 @@ static oe_result_t _syscall_hook(
-         OE_RAISE(OE_INVALID_PARAMETER);
- 
-     *ret = _syscall_dispatch(number, arg1, arg2, arg3, arg4, arg5, arg6);
--    result = OE_OK;
-+    if (*ret != -2)
-+        result = OE_OK;
- done:
-     return result;
- }
 diff --git a/tests/debugger/non_debug/CMakeLists.txt b/tests/debugger/non_debug/CMakeLists.txt
 index 26364240b..ecdb261fb 100644
 --- a/tests/debugger/non_debug/CMakeLists.txt
@@ -3491,7 +3468,7 @@ index 90d0d7e2e..d17c9028c 100644
  
  # Add the enclave for postive tests
 diff --git a/tests/module_loading/module/module.c b/tests/module_loading/module/module.c
-index 3fbecd8a5..199a280c9 100644
+index 0cd2fda46..bf5cc35da 100644
 --- a/tests/module_loading/module/module.c
 +++ b/tests/module_loading/module/module.c
 @@ -59,7 +59,6 @@ int test_libc_symbols()
@@ -3502,7 +3479,7 @@ index 3fbecd8a5..199a280c9 100644
      TEST_SYMBOL(pthread_mutex_destroy);
      TEST_SYMBOL(pthread_mutex_init);
      TEST_SYMBOL(pthread_mutex_lock);
-@@ -73,9 +72,5 @@ int test_libc_symbols()
+@@ -74,9 +73,5 @@ int test_libc_symbols()
      if (sizeof(pthread_mutex_t) != 40)
          return 0;
  
diff --git a/3rdparty/openenclave/openenclave b/3rdparty/openenclave/openenclave
index d03eb3a9c..d40b81cd9 160000
--- a/3rdparty/openenclave/openenclave
+++ b/3rdparty/openenclave/openenclave
@@ -1 +1 @@
-Subproject commit d03eb3a9c75b5640bf4508eac71793ee4fc67356
+Subproject commit d40b81cd9dbfe865bd12bfc16c898d587ff07d48