Skip to content

Commit ed00559

Browse files
committed
update OE to include: Update mbedtls submodule commit to actually use 2.28.9
Signed-off-by: Thomas Tendyck <[email protected]>
1 parent 54be136 commit ed00559

File tree

2 files changed

+1
-54
lines changed

2 files changed

+1
-54
lines changed

3rdparty/openenclave/ert.patch

-53
Original file line numberDiff line numberDiff line change
@@ -1283,19 +1283,6 @@ index 2471fe6f1..f7296ef7d 100644
12831283
+
12841284
return result;
12851285
}
1286-
diff --git a/host/sgx/sgxload.c b/host/sgx/sgxload.c
1287-
index 9011bfe61..3fc5df59f 100644
1288-
--- a/host/sgx/sgxload.c
1289-
+++ b/host/sgx/sgxload.c
1290-
@@ -470,6 +470,8 @@ oe_result_t oe_sgx_create_enclave(
1291-
else
1292-
secs->base = (uint64_t)image_base;
1293-
}
1294-
+#else
1295-
+ OE_UNUSED(ex_features);
1296-
#endif // !defined(OEHOSTMR)
1297-
*enclave_addr = image_base ? (uint64_t)image_base : secs->base;
1298-
context->state = OE_SGX_LOAD_STATE_ENCLAVE_CREATED;
12991286
diff --git a/include/openenclave/attestation/sgx/evidence.h b/include/openenclave/attestation/sgx/evidence.h
13001287
index 4a19d4187..33b458429 100644
13011288
--- a/include/openenclave/attestation/sgx/evidence.h
@@ -3402,16 +3389,6 @@ index 752a1e7f0..3b17f2146 100644
34023389
OE_TRACE_INFO(
34033390
"TDX V4 quote contains %zu claims. TDX V5 quote contains %zu "
34043391
"claims\n\n",
3405-
diff --git a/tests/invalid_image/CMakeLists.txt b/tests/invalid_image/CMakeLists.txt
3406-
index 28a19d9fc..d483644e9 100644
3407-
--- a/tests/invalid_image/CMakeLists.txt
3408-
+++ b/tests/invalid_image/CMakeLists.txt
3409-
@@ -4,4 +4,5 @@
3410-
add_executable(invalid_image main.cpp)
3411-
target_link_libraries(invalid_image oehost)
3412-
set_property(TARGET invalid_image PROPERTY POSITION_INDEPENDENT_CODE OFF)
3413-
+target_link_options(invalid_image PRIVATE -no-pie)
3414-
add_test(tests/invalid_image invalid_image)
34153392
diff --git a/tests/invalid_image/main.cpp b/tests/invalid_image/main.cpp
34163393
index c32f0d0f8..57ba0486c 100644
34173394
--- a/tests/invalid_image/main.cpp
@@ -3714,18 +3691,6 @@ index 10286da24..db9188cf7 100644
37143691

37153692
printf("=== This program is used to test enclave seal key functions.\n");
37163693

3717-
diff --git a/tests/sgx_zerobase/enc/enc.cpp b/tests/sgx_zerobase/enc/enc.cpp
3718-
index e28a84eec..23df44d80 100644
3719-
--- a/tests/sgx_zerobase/enc/enc.cpp
3720-
+++ b/tests/sgx_zerobase/enc/enc.cpp
3721-
@@ -36,6 +36,7 @@ void _initialize_exception_handler(void)
3722-
{
3723-
oe_result_t result;
3724-
result = oe_add_vectored_exception_handler(false, test_pfgp_handler);
3725-
+ OE_UNUSED(result);
3726-
}
3727-
3728-
int test_enclave_memory_access(uint64_t address, bool* exception)
37293694
diff --git a/tests/stack_overflow_exception/enc/enc.c b/tests/stack_overflow_exception/enc/enc.c
37303695
index aef0e74b9..a0606fa31 100644
37313696
--- a/tests/stack_overflow_exception/enc/enc.c
@@ -4339,24 +4304,6 @@ index 8663be27f..0aa6e579f 100644
43394304
SOURCES
43404305
enc.c
43414306
${CMAKE_CURRENT_BINARY_DIR}/oeseal_t.c)
4342-
diff --git a/tests/tools/oesign/test-enclave/enclave/enc.c b/tests/tools/oesign/test-enclave/enclave/enc.c
4343-
index be4a084b8..e3bd8e690 100644
4344-
--- a/tests/tools/oesign/test-enclave/enclave/enc.c
4345-
+++ b/tests/tools/oesign/test-enclave/enclave/enc.c
4346-
@@ -13,11 +13,10 @@
4347-
#include "oesign_test_t.h"
4348-
4349-
/* Null-terminated hex string buffer size with 2 char per byte */
4350-
-const size_t OE_KSS_ID_HEX_BUFFER_SIZE = sizeof(oe_uuid_t) * 2 + 1;
4351-
+#define OE_KSS_ID_HEX_BUFFER_SIZE (sizeof(oe_uuid_t) * 2 + 1)
4352-
/* Null-terminated hex string buffer size with 2 char per byte and 4 formatting
4353-
* chars */
4354-
-const size_t FORMATTED_OE_KSS_ID_HEX_BUFFER_SIZE =
4355-
- OE_KSS_ID_HEX_BUFFER_SIZE + 4;
4356-
+#define FORMATTED_OE_KSS_ID_HEX_BUFFER_SIZE (OE_KSS_ID_HEX_BUFFER_SIZE + 4)
4357-
4358-
static const oe_uuid_t _ecdsa_uuid = {OE_FORMAT_UUID_SGX_ECDSA};
4359-
43604307
diff --git a/tests/tools/oesign/test-enclave/host/host.c b/tests/tools/oesign/test-enclave/host/host.c
43614308
index b52ce1d24..397975850 100644
43624309
--- a/tests/tools/oesign/test-enclave/host/host.c

0 commit comments

Comments
 (0)