Update Openenclave to the latest version

Install lsb release explicitly
deislabs · Jul 28, 2023 · 412e2ff · 412e2ff
1 parent 16ec109
commit 412e2ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -92,6 +92,7 @@ clean:
 ##==============================================================================
 
 build-prereqs:
+	sudo apt install -y lsb-release
 	make -C $(TOP)/prereqs/
 
 init: build-prereqs

diff --git a/defs.mak b/defs.mak
@@ -86,6 +86,7 @@ OE_BINDIR += $(BUILDDIR)/openenclave/bin
 
 OEENCLAVE_INCLUDES =
 OEENCLAVE_INCLUDES += -I$(OE_INCDIR)
+OEENCLAVE_INCLUDES += -I$(OE_INCDIR)/openenclave/3rdparty/openssl_3
 OEENCLAVE_INCLUDES += -I$(OE_INCDIR)/openenclave/3rdparty
 OEENCLAVE_INCLUDES += -I$(OE_INCDIR)/openenclave/3rdparty/libc
 OEENCLAVE_INCLUDES += -I$(OE_INCDIR)/openenclave/3rdparty/mbedtls

diff --git a/third_party/openenclave/Makefile b/third_party/openenclave/Makefile
@@ -5,8 +5,8 @@ TOP=$(abspath $(CURDIR)/../..)
 BUILDDIR=${TOP}/build
 
 URL=https://github.com/openenclave/openenclave
-BRANCH=master
-COMMIT=9385705291d2180589a8bd690e1b32c874e12250
+BRANCH=v0.19.x
+COMMIT=38cfb435aa78b40546a87d22fa9c61587eeb7f21
 
 OPENENCLAVE_INSTALL_PREFIX=$(BUILDDIR)/openenclave
 OPENENCLAVE_SRC = $(CURDIR)/openenclave
@@ -64,6 +64,7 @@ openenclave:
 	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/musl/musl )
 	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/mbedtls/mbedtls )
 	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/openssl/openssl )
+	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/openssl/openssl_3 )
 	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/openssl/intel-sgx-ssl )
 	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/snmalloc )
 	( cd openenclave; $(FETCH_SUBMODULE) 3rdparty/symcrypt_engine/SymCrypt-OpenSSL )