Skip to content

Commit

Permalink
update OE to v0.19.8
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Tendyck <[email protected]>
  • Loading branch information
thomasten committed Oct 9, 2024
1 parent 740d790 commit 2d004bb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
32 changes: 17 additions & 15 deletions 3rdparty/openenclave/ert.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1617,12 +1617,12 @@ index 526ae583f..8198d8da0 100644
+
+OE_WEAK_ALIAS(calloc, __libc_calloc);
diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
index 6be178acd..7bb94b19e 100644
index 28fd6e8b5..16379ab61 100644
--- a/pkgconfig/CMakeLists.txt
+++ b/pkgconfig/CMakeLists.txt
@@ -104,7 +104,7 @@ set(ENCLAVE_OPENSSL_3_CRYPTO_WRAPPER_LIBS -loecryptoopenssl_3 -lopensslssl_3
set(ENCLAVE_OPENSSL_SYMCRYPT_FIPS_WRAPPER_LIBS
-loesymcryptengine -loecryptoopenssl -lopensslssl -lopensslcrypto)
@@ -107,7 +107,7 @@ set(ENCLAVE_OPENSSL_SYMCRYPT_FIPS_WRAPPER_LIBS
set(ENCLAVE_OPENSSL_3_SYMCRYPT_FIPS_WRAPPER_LIBS
-loesymcryptprovider -loecryptoopenssl_3 -lopensslssl_3 -lopensslcrypto_3)

-set(ENCLAVE_CLIBS_2 -loelibc -loesyscall -loecore)
+set(ENCLAVE_CLIBS_2 -loelibc -loesyscall -loelibc -loecore)
Expand Down Expand Up @@ -1656,26 +1656,26 @@ index 410bdd9ae..e7d1e8283 100644
clean:
rm -f sqlite_host host.o sqlite_u.o sqlite_u.c sqlite_u.h sqlite_args.h
diff --git a/samples/attested_tls/client/enc/Makefile b/samples/attested_tls/client/enc/Makefile
index 654b9a18e..5f66d8c96 100644
index 18f2b6b23..8c12cc3b1 100644
--- a/samples/attested_tls/client/enc/Makefile
+++ b/samples/attested_tls/client/enc/Makefile
@@ -45,7 +45,7 @@ build:

$(CXX) -g -c $(CXXFLAGS) $(INCLUDES) -I. -std=c++11 $(SRC_FILES)
$(CC) -c $(CFLAGS) $(CINCLUDES) -I. ./tls_client_t.c
$(CXX) -g -c $(CXXFLAGS) -I. -std=c++11 $(SRC_FILES)
$(CC) -c $(CFLAGS) -I. ./tls_client_t.c
- $(CXX) -o tls_client_enc $(OBJ_FILES) $(LDFLAGS) $(CRYPTO_LDFLAGS) -loehostsock -loehostresolver
+ $(CXX) -o tls_client_enc $(OBJ_FILES) $(LDFLAGS) $(CRYPTO_LDFLAGS) -loehostsock -loehostresolver -loecore

sign:
oesign sign -e tls_client_enc -c enc.conf -k private.pem
diff --git a/samples/attested_tls/server/enc/Makefile b/samples/attested_tls/server/enc/Makefile
index d86614e2a..da1686d7c 100644
index 23c6459e0..4cd7f4398 100644
--- a/samples/attested_tls/server/enc/Makefile
+++ b/samples/attested_tls/server/enc/Makefile
@@ -47,7 +47,7 @@ build:

$(CXX) -g -c $(CXXFLAGS) $(INCLUDES) -I. -std=c++11 ${SRC_FILES}
$(CC) -c $(CFLAGS) $(CINCLUDES) -I. tls_server_t.c
$(CXX) -g -c $(CXXFLAGS) -I. -std=c++11 ${SRC_FILES}
$(CC) -c $(CFLAGS) -I. tls_server_t.c
- $(CXX) -o tls_server_enc $(OBJ_FILES) $(LDFLAGS) $(CRYPTO_LDFLAGS) -loehostsock -loehostresolver
+ $(CXX) -o tls_server_enc $(OBJ_FILES) $(LDFLAGS) $(CRYPTO_LDFLAGS) -loehostsock -loehostresolver -loecore

Expand Down Expand Up @@ -1734,15 +1734,16 @@ index 234aa640b..5e8043871 100644
clean:
rm -f switchlesshost host.o switchless_sample_u.o \
diff --git a/samples/test-samples.cmake b/samples/test-samples.cmake
index 10ebab6c2..2ae0ac648 100644
index c04280f23..206afb27d 100644
--- a/samples/test-samples.cmake
+++ b/samples/test-samples.cmake
@@ -80,24 +80,14 @@ else ()
@@ -80,26 +80,14 @@ else ()
APPEND
SAMPLES_LIST
attested_tls
- attested_tls
- attested_tls
- attested_tls
- attested_tls
attestation
- file-encryptor
Expand All @@ -1755,6 +1756,7 @@ index 10ebab6c2..2ae0ac648 100644
- openssl
- openssl_symcrypt_fips
- openssl_3
- openssl_3_symcrypt_prov_fips
- mbedtls
mbedtls
- openssl
Expand Down Expand Up @@ -3238,10 +3240,10 @@ index db56a077e..3d9448152 100644
{
int ret = -1;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7dbe08967..578987fe3 100644
index fc215ce48..4e0a24073 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -148,7 +148,7 @@ if (UNIX
@@ -149,7 +149,7 @@ if (UNIX
add_subdirectory(custom_claims)
add_subdirectory(debug-mode)
add_subdirectory(ecall)
Expand All @@ -3250,7 +3252,7 @@ index 7dbe08967..578987fe3 100644
add_subdirectory(ecall_ocall)
add_subdirectory(echo)
add_subdirectory(enclaveparam)
@@ -171,8 +171,8 @@ if (UNIX
@@ -172,8 +172,8 @@ if (UNIX
add_subdirectory(SampleApp)
add_subdirectory(SampleAppCRT)
add_subdirectory(sealKey)
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/openenclave/openenclave
Submodule openenclave updated 67 files
+3 −0 .gitmodules
+1 −18 .jenkins/Jenkinsfile
+2 −6 .jenkins/infrastructure/build_base_azure_gallery_image.Jenkinsfile
+3 −8 .jenkins/infrastructure/update_production_infrastructure.Jenkinsfile
+2 −5 .jenkins/library/vars/common.groovy
+1 −0 3rdparty/CMakeLists.txt
+3 −2 3rdparty/symcrypt_engine/CMakeLists.txt
+181 −0 3rdparty/symcrypt_provider/CMakeLists.txt
+1 −0 3rdparty/symcrypt_provider/SymCrypt-OpenSSL
+15 −4 DOCKER_IMAGES.md
+7 −0 cmake/add_enclave.cmake
+24 −0 enclave/crypto/mbedtls/init.c
+5 −1 enclave/crypto/openssl/CMakeLists.txt
+76 −3 enclave/crypto/openssl/init.c
+21 −0 enclave/crypto/openssl/symcrypt_provider.c
+2 −0 enclave/link.c
+1 −0 include/openenclave/internal/crypto/init.h
+14 −0 pkgconfig/CMakeLists.txt
+1 −0 pkgconfig/README.md
+1 −0 pkgconfig/oeenclave-clang++-lvi-cfg.pc
+1 −0 pkgconfig/oeenclave-clang++.pc
+1 −0 pkgconfig/oeenclave-clang-lvi-cfg.pc
+1 −0 pkgconfig/oeenclave-clang.pc
+1 −0 pkgconfig/oeenclave-g++-lvi-cfg.pc
+1 −0 pkgconfig/oeenclave-g++.pc
+1 −0 pkgconfig/oeenclave-gcc-lvi-cfg.pc
+1 −0 pkgconfig/oeenclave-gcc.pc
+3 −2 samples/attested_tls/CMakeLists.txt
+1 −1 samples/attested_tls/Makefile
+29 −4 samples/attested_tls/README.md
+19 −1 samples/attested_tls/client/enc/CMakeLists.txt
+7 −7 samples/attested_tls/client/enc/Makefile
+3 −3 samples/attested_tls/client/host/Makefile
+1 −1 samples/attested_tls/non_enc_client/Makefile
+21 −3 samples/attested_tls/server/enc/CMakeLists.txt
+7 −7 samples/attested_tls/server/enc/Makefile
+3 −3 samples/attested_tls/server/host/Makefile
+11 −3 samples/helloworld/README.md
+7 −1 samples/test-samples.cmake
+1 −0 scripts/.check-license.ignore
+2 −1 scripts/ansible/install-ansible.sh
+5 −1 scripts/ansible/remove-ansible.sh
+1 −0 scripts/ansible/requirements.txt
+51 −1 scripts/ansible/roles/linux/docker/tasks/ubuntu/stable-install.yml
+0 −14 scripts/ansible/roles/linux/docker/vars/ubuntu/bionic.yml
+7 −2 scripts/ansible/roles/linux/docker/vars/ubuntu/main.yml
+2 −2 scripts/ansible/roles/linux/intel/vars/ubuntu/main.yml
+2 −0 scripts/ansible/roles/linux/jenkins/tasks/packer.yml
+0 −81 scripts/ansible/roles/linux/jenkins/tasks/slave-setup.yml
+0 −8 scripts/ansible/roles/linux/jenkins/templates/jenkins-slave.default.j2
+0 −28 scripts/ansible/roles/linux/jenkins/templates/jenkins-slave.service.j2
+39 −20 scripts/install-windows-prereqs.ps1
+4 −2 tests/CMakeLists.txt
+19 −3 tests/openssl/CMakeLists.txt
+30 −8 tests/openssl/enc/CMakeLists.txt
+0 −2 tests/openssl/tests_3.supported
+3 −0 tests/openssl/tests_3.unsupported
+4 −0 tests/openssl/tests_3.unsupported.symcrypt
+17 −11 tests/symcrypt_engine/enc/CMakeLists.txt
+0 −12 tests/symcrypt_engine/enc/symcrypt_engine_test.c
+15 −0 tests/symcrypt_provider/CMakeLists.txt
+63 −0 tests/symcrypt_provider/enc/CMakeLists.txt
+25 −0 tests/symcrypt_provider/enc/enc.c
+34 −0 tests/symcrypt_provider/host/CMakeLists.txt
+51 −0 tests/symcrypt_provider/host/host.c
+13 −0 tests/symcrypt_provider/symcrypt_provider.edl
+12 −0 tests/symcrypt_provider/symcrypt_provider_no_entropy.edl

0 comments on commit 2d004bb

Please sign in to comment.