- build fixes due to file rename

fortanix · Nov 7, 2024 · c465b9c · c465b9c
1 parent cd5e8da
commit c465b9c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/intel-sgx/ppid-decryption-tool/Enclave/Makefile b/intel-sgx/ppid-decryption-tool/Enclave/Makefile
@@ -49,6 +49,15 @@ $(OUTPUT_T) : $(TRUSTED_OBJECTS) $(OBJECTS)
 	echo "$(INDENT)[LD]  " $(OBJECTS) $(TRUSTED_OBJECTS) $(ENCLAVE_LIBS) $(ENCLAVE_LIBS_PARTS) $(OUTPUT_T_UNSIG)
 	$(LD) $(OBJECTS) $(TRUSTED_OBJECTS) $(LD_FLAGS) $(LIB_DIRS) -o $(OUTPUT_T_UNSIG)
 
+	echo "$(INDENT)[GEN] $(PRIVATE_KEY) ($(KEY_SIZE) bits)"
+
+	# generate 3072 bit private RSA key
+	openssl genrsa -out $(PRIVATE_KEY) -3 $(KEY_SIZE)
+
+	echo "$(INDENT)[EXT] $(PUBLIC_KEY)"
+	# extract public key
+	openssl rsa -in $(PRIVATE_KEY) -pubout -out $(PUBLIC_KEY)
+
 	echo "$(INDENT)[SGN]" $(OUTPUT_T_UNSIG)
 	$(SIGNER) sign -key $(PRIVATE_KEY) -enclave $(OUTPUT_T_UNSIG) -out $(OUTPUT_T) -config $(ENCLAVE_CONFIG) > /dev/null 2> /dev/null
 

diff --git a/intel-sgx/ppid-decryption-tool/Enclave/ppid.edl b/intel-sgx/ppid-decryption-tool/Enclave/ppid.edl
@@ -12,7 +12,6 @@ trusted {
                             [in]const sgx_target_info_t *pce_target_info,
                             [out] sgx_report_t *p_ide_report,
                             uint8_t crypto_suite,
-                            uint16_t cert_key_type,
                             uint32_t key_size,
                             [out, size=key_size] uint8_t *p_public_key);
     public sgx_status_t ide_decrypt_ppid(

diff --git a/intel-sgx/ppid-decryption-tool/Makefile b/intel-sgx/ppid-decryption-tool/Makefile
@@ -14,8 +14,7 @@ INCLUDE              = -I ${SGX_SDK}/include
 OBJECTS              = main.o
 SUBDIRS              = Enclave pce
 LIB_SGX_URTS         = -lsgx_urts
-LIB_UAE_SERVICE      = -lsgx_uae_service
-LIBS                 = -lppid_proxy $(LIB_SGX_URTS) $(LIB_UAE_SERVICE) -lpthread pce/pce_enclave_u.o
+LIBS                 = -lppid_proxy $(LIB_SGX_URTS) -lpthread pce/pce_u.o
 LIB_DIRS             = $(SUBDIRS:%=-L %)                                            \
 			$(patsubst %,-L%,$(subst :, ,$(SGX_LIBS)))
 BUILDDIRS            = $(SUBDIRS:%=build-%)

diff --git a/intel-sgx/ppid-decryption-tool/main.c b/intel-sgx/ppid-decryption-tool/main.c
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Enclave/ppid_u.h"
-#include "pce/pce_enclave_u.h"
+#include "pce/pce_u.h"
 #include <inttypes.h>
 #include <sgx_urts.h>
 #include <stdint.h>

diff --git a/intel-sgx/ppid-decryption-tool/pce/Makefile b/intel-sgx/ppid-decryption-tool/pce/Makefile
@@ -14,13 +14,13 @@ INCLUDE           = -I${SGX_SDK}/include                               \
 T_CFLAGS	  = $(CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector -g
 U_CFLAGS	  = $(CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector -g
 AR_FLAGS	  = rcs
-OBJECTS		  = pce_enclave_u.c pce_enclave_u.h pce_enclave_u.o
+OBJECTS		  = pce_u.c pce_u.h pce_u.o
 LIB_SGX_TRTS      = -lsgx_trts
 LIB_SGX_TSERVICE  = -lsgx_tservice
 
 ENCLAVE_LIBS      = $(LIB_SGX_TRTS)
 ENCLAVE_LIB_PARTS = -lsgx_tstdc -lsgx_tcrypto $(LIB_SGX_TSERVICE)
-ENCLAVE	          = pce_enclave
+ENCLAVE	          = pce
 ENCLAVE_EDL       = $(ENCLAVE).edl
 OUTPUT_U          = $(ENCLAVE)_u.o